nightpool
/
mastodon
forked from cybrespace/mastodon
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix broken migrate (regression from #7658) (#7674)

This commit is contained in:
Yamagishi Kazutoshi 2018-05-30 16:39:52 +09:00 committed by Eugen Rochko
parent a16e06bbf5
commit 9130b3cda9
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
db/migrate/20180528141303_fix_accounts_unique_index.rb
View File

@ -36,7 +36,7 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
def deduplicate_account!(account_ids) def deduplicate_account!(account_ids)
accounts = Account.where(id: account_ids).to_a accounts = Account.where(id: account_ids).to_a
accounts = account.first.local? ? accounts.sort_by(&:created_at) : accounts.sort_by(&:updated_at).reverse accounts = accounts.first.local? ? accounts.sort_by(&:created_at) : accounts.sort_by(&:updated_at).reverse
reference_account = accounts.shift reference_account = accounts.shift
accounts.each do |other_account| accounts.each do |other_account|
@ -69,15 +69,19 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
# to check for (and skip past) uniqueness errors # to check for (and skip past) uniqueness errors
[Follow, FollowRequest, Block, Mute].each do |klass| [Follow, FollowRequest, Block, Mute].each do |klass|
klass.where(account_id: duplicate_account.id).find_each do |record| klass.where(account_id: duplicate_account.id).find_each do |record|
record.update(account_id: main_account.id) begin
rescue ActiveRecord::RecordNotUnique record.update(account_id: main_account.id)
next rescue ActiveRecord::RecordNotUnique
next
end
end end
klass.where(target_account_id: duplicate_account.id).find_each do |record| klass.where(target_account_id: duplicate_account.id).find_each do |record|
record.update(target_account_id: main_account.id) begin
rescue ActiveRecord::RecordNotUnique record.update(target_account_id: main_account.id)
next rescue ActiveRecord::RecordNotUnique
next
end
end end
end end
end end