From: Eugen Rochko <eugen@zeonfederated.com>
Date: Mon, 7 Jan 2019 08:47:00 +0000 (+0100)
Subject: Fix regression in custom emoji migration (#9742)
X-Git-Url: https://git.xn--scling-oua.cat.family/?a=commitdiff_plain;h=0a4caa89c364fb9dcec966166e4bc9620ddf1013;p=mastodon.git

Fix regression in custom emoji migration (#9742)

Fix #9741
---

diff --git a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
index 1fce2cb37..65f1fc8d9 100644
--- a/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
+++ b/db/migrate/20181207011115_downcase_custom_emoji_domains.rb
@@ -2,7 +2,7 @@ class DowncaseCustomEmojiDomains < ActiveRecord::Migration[5.2]
   disable_ddl_transaction!
 
   def up
-    duplicates = CustomEmoji.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM custom_emojis GROUP BY lower(domain) HAVING count(*) > 1').to_hash
+    duplicates = CustomEmoji.connection.select_all('SELECT string_agg(id::text, \',\') AS ids FROM custom_emojis GROUP BY shortcode, lower(domain) HAVING count(*) > 1').to_hash
 
     duplicates.each do |row|
       CustomEmoji.where(id: row['ids'].split(',')[0...-1]).destroy_all