diff options
| author | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-17 11:51:22 +0800 |
|---|---|---|
| committer | Heinrich Lee Yu <heinrich@gitlab.com> | 2019-07-25 12:21:38 +0800 |
| commit | 2b3d00a77822eaf2e622dd0b1baf85ebea2b1ee4 (patch) | |
| tree | 4444788d3f059ea8fa970dadcc777a72a00bcb04 /lib | |
| parent | 046c85ed603f8fb581b1be71a5de5525e24a5fbb (diff) | |
| download | gitlab-ce-2b3d00a77822eaf2e622dd0b1baf85ebea2b1ee4.tar.gz | |
Remove unneeded monkey-patch54478-table_exists-not-compatible-with-rails-5-1
Changes all calls to data_source_exists? to table_exists?
since that is the intent of these calls
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/gitlab/background_migration/prepare_untracked_uploads.rb | 2 | ||||
| -rw-r--r-- | lib/tasks/gitlab/db.rake | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/gitlab/background_migration/prepare_untracked_uploads.rb b/lib/gitlab/background_migration/prepare_untracked_uploads.rb index 7d40b459c9a..806c3a7a369 100644 --- a/lib/gitlab/background_migration/prepare_untracked_uploads.rb +++ b/lib/gitlab/background_migration/prepare_untracked_uploads.rb @@ -55,7 +55,7 @@ module Gitlab def ensure_temporary_tracking_table_exists table_name = :untracked_files_for_uploads - unless ActiveRecord::Base.connection.data_source_exists?(table_name) + unless ActiveRecord::Base.connection.table_exists?(table_name) UntrackedFile.connection.create_table table_name do |t| t.string :path, limit: 600, null: false t.index :path, unique: true diff --git a/lib/tasks/gitlab/db.rake b/lib/tasks/gitlab/db.rake index 5f2ed5274e4..d054959e05e 100644 --- a/lib/tasks/gitlab/db.rake +++ b/lib/tasks/gitlab/db.rake @@ -33,7 +33,7 @@ namespace :gitlab do # Removes the entry from the array tables.delete 'schema_migrations' # Truncate schema_migrations to ensure migrations re-run - connection.execute('TRUNCATE schema_migrations') if connection.data_source_exists? 'schema_migrations' + connection.execute('TRUNCATE schema_migrations') if connection.table_exists? 'schema_migrations' # Drop tables with cascade to avoid dependent table errors # PG: http://www.postgresql.org/docs/current/static/ddl-depend.html |
