From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 7 Oct 2019 04:05:14 +0000 (+0200)
Subject: Fix old migration trying to use new column due to default status scope (#12095)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=ebe574d5b57c647450cab3d4ca2e8ca52c4fb3fe;p=mastodon.git

Fix old migration trying to use new column due to default status scope (#12095)

Fix #12087
---

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