]> cat aescling's git repositories - mastodon.git/commitdiff
Fix old migration trying to use new column due to default status scope (#12095)
authorEugen Rochko <eugen@zeonfederated.com>
Mon, 7 Oct 2019 04:05:14 +0000 (06:05 +0200)
committerGitHub <noreply@github.com>
Mon, 7 Oct 2019 04:05:14 +0000 (06:05 +0200)
Fix #12087

db/migrate/20181024224956_migrate_account_conversations.rb

index b718f9e1d524e73782bc5824372307c8cc24944b..d4bc3b91d9245e7aa7455d96aac3d4cc22ad5452 100644 (file)
@@ -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