about summary refs log tree commit diff
diff options
context:
space:
mode:
authorEugen Rochko <eugen@zeonfederated.com>2019-01-07 09:47:00 +0100
committerGitHub <noreply@github.com>2019-01-07 09:47:00 +0100
commit0a4caa89c364fb9dcec966166e4bc9620ddf1013 (patch)
tree54c3e9bb6e9037d4e4c2ca0224f723eac8ba3d9b
parent57c91fbbed7fa5f44c7144194e313f003c2ef8b3 (diff)
Fix regression in custom emoji migration (#9742)
Fix #9741
-rw-r--r--db/migrate/20181207011115_downcase_custom_emoji_domains.rb2
1 files changed, 1 insertions, 1 deletions
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