diff options
author | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
---|---|---|
committer | Starfall <us@starfall.systems> | 2021-06-08 09:28:57 -0500 |
commit | f95637178671b1aa0648fa506231717229a6cd8f (patch) | |
tree | fbaa725bcdb88220c5d1e299b338b196822460e5 /db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb | |
parent | 2c6fcb9cf8fbb09e900fc3625837529155f98f4f (diff) | |
parent | db5baf3d1a93cbf6961f721205cff0beaf71bffd (diff) |
Merge branch 'glitch'
Conflicts: yarn.lock: caniuse-lite has been outdated in upstream for awhile, and we fixed it a few weeks ago in our fork
Diffstat (limited to 'db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb')
-rw-r--r-- | db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb | 17 |
1 files changed, 6 insertions, 11 deletions
diff --git a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb index c3aa8e33c..366bf9aa7 100644 --- a/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb +++ b/db/migrate/20200620164023_add_fixed_lowercase_index_to_accounts.rb @@ -1,15 +1,9 @@ -class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2] - disable_ddl_transaction! +require Rails.root.join('lib', 'mastodon', 'migration_helpers') - class CorruptionError < StandardError - def cause - nil - end +class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2] + include Mastodon::MigrationHelpers - def backtrace - [] - end - end + disable_ddl_transaction! def up if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower') && index_name_exists?(:accounts, 'index_accounts_on_username_and_domain_lower') @@ -21,7 +15,8 @@ class AddFixedLowercaseIndexToAccounts < ActiveRecord::Migration[5.2] begin add_index :accounts, "lower (username), COALESCE(lower(domain), '')", name: 'index_accounts_on_username_and_domain_lower', unique: true, algorithm: :concurrently rescue ActiveRecord::RecordNotUnique - raise CorruptionError, 'Migration failed because of index corruption, see https://docs.joinmastodon.org/admin/troubleshooting/index-corruption/#fixing' + remove_index :accounts, name: 'index_accounts_on_username_and_domain_lower' + raise CorruptionError end remove_index :accounts, name: 'old_index_accounts_on_username_and_domain_lower' if index_name_exists?(:accounts, 'old_index_accounts_on_username_and_domain_lower') |