diff options
author | ThibG <thib@sitedethib.com> | 2019-10-11 22:28:11 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-10-11 22:28:11 +0200 |
commit | ef925f31a66d1cbc95bff11669d05e2924d8ce85 (patch) | |
tree | aadbb60d22a196075fe1faaeeae169e5badead57 /db/migrate | |
parent | b3dd0d276d52042828e11bf325015f5d7f4624ca (diff) | |
parent | 877e8c9d799eae663526609642e0c0c9a4612bda (diff) |
Merge pull request #1233 from ThibG/glitch-soc/merge-upstream
Merge upstream changes
Diffstat (limited to 'db/migrate')
-rw-r--r-- | db/migrate/20181024224956_migrate_account_conversations.rb | 2 | ||||
-rw-r--r-- | db/migrate/20191007013357_update_pt_locales.rb | 11 |
2 files changed, 12 insertions, 1 deletions
diff --git a/db/migrate/20181024224956_migrate_account_conversations.rb b/db/migrate/20181024224956_migrate_account_conversations.rb index b718f9e1d..d4bc3b91d 100644 --- a/db/migrate/20181024224956_migrate_account_conversations.rb +++ b/db/migrate/20181024224956_migrate_account_conversations.rb @@ -52,6 +52,6 @@ class MigrateAccountConversations < ActiveRecord::Migration[5.2] end def notifications_about_direct_statuses - Notification.joins(mention: :status).where(activity_type: 'Mention', statuses: { visibility: :direct }) + Notification.joins('INNER JOIN mentions ON mentions.id = notifications.activity_id INNER JOIN statuses ON statuses.id = mentions.status_id').where(activity_type: 'Mention', statuses: { visibility: :direct }) end end diff --git a/db/migrate/20191007013357_update_pt_locales.rb b/db/migrate/20191007013357_update_pt_locales.rb new file mode 100644 index 000000000..b7288d38a --- /dev/null +++ b/db/migrate/20191007013357_update_pt_locales.rb @@ -0,0 +1,11 @@ +class UpdatePtLocales < ActiveRecord::Migration[5.2] + disable_ddl_transaction! + + def up + User.where(locale: 'pt').in_batches.update_all(locale: 'pt-PT') + end + + def down + User.where(locale: 'pt-PT').in_batches.update_all(locale: 'pt') + end +end |