diff options
| author | blackst0ne <blackst0ne.ru@gmail.com> | 2018-06-06 20:15:46 +1100 |
|---|---|---|
| committer | blackst0ne <blackst0ne.ru@gmail.com> | 2018-06-06 20:15:46 +1100 |
| commit | 1da00653ee1ecef8292d806a92a7306fbea3b518 (patch) | |
| tree | ab11744c22db6a8238461623993fa3bf1480f5b6 /db/post_migrate | |
| parent | bb6b73cf3c64a6f963e6afc657cab937db46564b (diff) | |
| download | gitlab-ce-1da00653ee1ecef8292d806a92a7306fbea3b518.tar.gz | |
[Rails5] Fix Arel::UpdateManager calls
In Rails 5.0 `Arel::UpdateManager.new` doesn't expect any parameters.
This commit makes the migration not pass any parameters if on Rails 5.0.
Diffstat (limited to 'db/post_migrate')
| -rw-r--r-- | db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb | 3 | ||||
| -rw-r--r-- | db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb | 3 |
2 files changed, 4 insertions, 2 deletions
diff --git a/db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb b/db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb index 69007b8e8ed..f058e85c1ec 100644 --- a/db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb +++ b/db/post_migrate/20161109150329_fix_project_records_with_invalid_visibility.rb @@ -1,4 +1,5 @@ class FixProjectRecordsWithInvalidVisibility < ActiveRecord::Migration + include Gitlab::Database::ArelMethods include Gitlab::Database::MigrationHelpers BATCH_SIZE = 500 @@ -33,7 +34,7 @@ class FixProjectRecordsWithInvalidVisibility < ActiveRecord::Migration end updates.each do |visibility_level, project_ids| - updater = Arel::UpdateManager.new(ActiveRecord::Base) + updater = arel_update_manager .table(projects) .set(projects[:visibility_level] => visibility_level) .where(projects[:id].in(project_ids)) diff --git a/db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb b/db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb index 78413a608f1..392fa00b1ba 100644 --- a/db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb +++ b/db/post_migrate/20170324160416_migrate_user_activities_to_users_last_activity_on.rb @@ -1,5 +1,6 @@ # rubocop:disable Migration/UpdateLargeTable class MigrateUserActivitiesToUsersLastActivityOn < ActiveRecord::Migration + include Gitlab::Database::ArelMethods include Gitlab::Database::MigrationHelpers disable_ddl_transaction! @@ -39,7 +40,7 @@ class MigrateUserActivitiesToUsersLastActivityOn < ActiveRecord::Migration activities = activities(day.at_beginning_of_day, day.at_end_of_day, page: page) update_sql = - Arel::UpdateManager.new(ActiveRecord::Base) + arel_update_manager .table(users_table) .set(users_table[:last_activity_on] => day.to_date) .where(users_table[:username].in(activities.map(&:first))) |