Unverified Commit fb1ae015 authored by Eugen Rochko's avatar Eugen Rochko Committed by GitHub
Browse files

Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation (#7688)

* Wrong exception class: ActiveRecord::RecordNotUnique, not PG::UniqueViolation

It's completely not obvious but PG::UniqueViolation is just a string inside the exception message, not the actual class of the exception

* Favourite does not have target_account_id
parent 19b4c666
......@@ -73,15 +73,17 @@ class FixAccountsUniqueIndex < ActiveRecord::Migration[5.2]
klass.where(account_id: duplicate_account.id).find_each do |record|
begin
record.update_attribute(:account_id, main_account.id)
rescue PG::UniqueViolation
rescue ActiveRecord::RecordNotUnique
next
end
end
end
[Follow, FollowRequest, Block, Mute].each do |klass|
klass.where(target_account_id: duplicate_account.id).find_each do |record|
begin
record.update_attribute(:target_account_id, main_account.id)
rescue PG::UniqueViolation
rescue ActiveRecord::RecordNotUnique
next
end
end
......
Supports Markdown
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment