Merge branch 'rails5-database' into 'master'

Fix table_exists? to be Rails5 compatible

Closes #45107

See merge request gitlab-org/gitlab-ce!19418

3 files changed, 8 insertions, 7 deletions

diff --git a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
index 0d2074eed22..0dee683350f 100644
--- a/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
+++ b/spec/lib/gitlab/background_migration/populate_untracked_uploads_spec.rb
@@ -114,7 +114,7 @@ describe Gitlab::BackgroundMigration::PopulateUntrackedUploads, :sidekiq, :migra
     it 'does not drop the temporary tracking table after processing the batch, if there are still untracked rows' do
       subject.perform(1, untracked_files_for_uploads.last.id - 1)
 
-      expect(ActiveRecord::Base.connection.table_exists?(:untracked_files_for_uploads)).to be_truthy
+      expect(ActiveRecord::Base.connection.data_source_exists?(:untracked_files_for_uploads)).to be_truthy
     end
 
     it 'drops the temporary tracking table after processing the batch, if there are no untracked rows left' do
diff --git a/spec/lib/gitlab/database_spec.rb b/spec/lib/gitlab/database_spec.rb
index 8ac36ae8bab..8bb246aa4bd 100644
--- a/spec/lib/gitlab/database_spec.rb
+++ b/spec/lib/gitlab/database_spec.rb
@@ -314,8 +314,13 @@ describe Gitlab::Database do
 
   describe '.cached_table_exists?' do
     it 'only retrieves data once per table' do
-      expect(ActiveRecord::Base.connection).to receive(:table_exists?).with(:projects).once.and_call_original
-      expect(ActiveRecord::Base.connection).to receive(:table_exists?).with(:bogus_table_name).once.and_call_original
+      if Gitlab.rails5?
+        expect(ActiveRecord::Base.connection).to receive(:data_source_exists?).with(:projects).once.and_call_original
+        expect(ActiveRecord::Base.connection).to receive(:data_source_exists?).with(:bogus_table_name).once.and_call_original
+      else
+        expect(ActiveRecord::Base.connection).to receive(:table_exists?).with(:projects).once.and_call_original
+        expect(ActiveRecord::Base.connection).to receive(:table_exists?).with(:bogus_table_name).once.and_call_original
+      end
 
       2.times do
         expect(described_class.cached_table_exists?(:projects)).to be_truthy
diff --git a/spec/support/helpers/migrations_helpers.rb b/spec/support/helpers/migrations_helpers.rb
index 84abec75c26..0bc235701eb 100644
--- a/spec/support/helpers/migrations_helpers.rb
+++ b/spec/support/helpers/migrations_helpers.rb
@@ -10,10 +10,6 @@ module MigrationsHelpers
     ActiveRecord::Migrator.migrations_paths
   end
 
-  def table_exists?(name)
-    ActiveRecord::Base.connection.table_exists?(name)
-  end
-
   def migrations
     ActiveRecord::Migrator.migrations(migrations_paths)
   end