diff options
Diffstat (limited to 'lib/gitlab/database.rb')
| -rw-r--r-- | lib/gitlab/database.rb | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/lib/gitlab/database.rb b/lib/gitlab/database.rb index 86f17586898..eb50718e770 100644 --- a/lib/gitlab/database.rb +++ b/lib/gitlab/database.rb @@ -107,10 +107,6 @@ module Gitlab version.to_f >= MINIMUM_POSTGRES_VERSION end - def self.upsert_supported? - version.to_f >= 9.5 - end - def self.check_postgres_version_and_print_warning return if Gitlab::Database.postgresql_minimum_supported_version? return if Gitlab::Runtime.rails_runner? @@ -221,9 +217,7 @@ module Gitlab VALUES #{tuples.map { |tuple| "(#{tuple.join(', ')})" }.join(', ')} EOF - if upsert_supported? && on_conflict == :do_nothing - sql = "#{sql} ON CONFLICT DO NOTHING" - end + sql = "#{sql} ON CONFLICT DO NOTHING" if on_conflict == :do_nothing sql = "#{sql} RETURNING id" if return_ids |