Backport EE cleanups for lib/gitlab/database.rb
The file lib/gitlab/database.rb
contains some cleanups in EE that are not present in CE:
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb
index d160cadc2d..beafcfa05e 100644
--- a/lib/gitlab/database.rb
+++ b/lib/gitlab/database.rb
@@ -24,7 +24,7 @@ module Gitlab
def self.nulls_last_order(field, direction = 'ASC')
order = "#{field} #{direction}"
- if Gitlab::Database.postgresql?
+ if postgresql?
order << ' NULLS LAST'
else
# `field IS NULL` will be `0` for non-NULL columns and `1` for NULL
@@ -38,7 +38,7 @@ module Gitlab
def self.nulls_first_order(field, direction = 'ASC')
order = "#{field} #{direction}"
- if Gitlab::Database.postgresql?
+ if postgresql?
order << ' NULLS FIRST'
else
# `field IS NULL` will be `0` for non-NULL columns and `1` for NULL
@@ -50,7 +50,11 @@ module Gitlab
end
def self.random
- Gitlab::Database.postgresql? ? "RANDOM()" : "RAND()"
+ postgresql? ? "RANDOM()" : "RAND()"
+ end
+
+ def self.minute_interval(value)
+ postgresql? ? "#{value} * '1 minute'::interval" : "INTERVAL #{value} MINUTE"
end
def true_value
These cleanups should be ported back to CE to reduce the number of conflicts that may arise in this file.
@tiagonbotelho I'm assigning this to you since you made these cleanups in EE as far as I can tell.