[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.
This commit is contained in:
parent
bb6b73cf3c
commit
1da00653ee
4 changed files with 8 additions and 4 deletions
|
@ -1,4 +1,5 @@
|
|||
class FixupEnvironmentNameUniqueness < ActiveRecord::Migration
|
||||
include Gitlab::Database::ArelMethods
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = true
|
||||
|
@ -41,7 +42,7 @@ class FixupEnvironmentNameUniqueness < ActiveRecord::Migration
|
|||
|
||||
conflicts.each do |id, name|
|
||||
update_sql =
|
||||
Arel::UpdateManager.new(ActiveRecord::Base)
|
||||
arel_update_manager
|
||||
.table(environments)
|
||||
.set(environments[:name] => name + "-" + id.to_s)
|
||||
.where(environments[:id].eq(id))
|
||||
|
|
|
@ -2,6 +2,7 @@
|
|||
# for more information on how to write migrations for GitLab.
|
||||
|
||||
class AddEnvironmentSlug < ActiveRecord::Migration
|
||||
include Gitlab::Database::ArelMethods
|
||||
include Gitlab::Database::MigrationHelpers
|
||||
|
||||
DOWNTIME = true
|
||||
|
@ -19,7 +20,7 @@ class AddEnvironmentSlug < ActiveRecord::Migration
|
|||
finder = environments.project(:id, :name)
|
||||
|
||||
connection.exec_query(finder.to_sql).rows.each do |id, name|
|
||||
updater = Arel::UpdateManager.new(ActiveRecord::Base)
|
||||
updater = arel_update_manager
|
||||
.table(environments)
|
||||
.set(environments[:slug] => generate_slug(name))
|
||||
.where(environments[:id].eq(id))
|
||||
|
|
|
@ -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))
|
||||
|
|
|
@ -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)))
|
||||
|
|
Loading…
Reference in a new issue