From 183fbacaf6d7190e1a823f9c10a42d32fe6c5562 Mon Sep 17 00:00:00 2001 From: Kyle Hall Date: Fri, 17 Dec 2021 08:58:18 -0500 Subject: [PATCH] Revert "Revert "Bug 29631: (QA follow-up) Add missing cleanups"" This reverts commit 1e2e912be36000d8cb7b93d7848861d709e25192. --- installer/data/mysql/db_revs/210600012.pl | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/installer/data/mysql/db_revs/210600012.pl b/installer/data/mysql/db_revs/210600012.pl index 361a6056fc..673b43b646 100755 --- a/installer/data/mysql/db_revs/210600012.pl +++ b/installer/data/mysql/db_revs/210600012.pl @@ -24,6 +24,17 @@ return { }; if( !unique_key_exists( 'language_descriptions', 'uniq_desc' ) ) { + + $dbh->do(q{ + DELETE a + FROM language_descriptions AS a, language_descriptions AS b + WHERE a.id < b.id + AND a.subtag IS NOT NULL + AND a.subtag=b.subtag + AND a.lang IS NOT NULL + AND a.lang=b.lang + AND a.type=b.type + }); $dbh->do(q{ ALTER TABLE language_descriptions ADD UNIQUE KEY uniq_desc (subtag, type, lang) @@ -31,6 +42,15 @@ return { }; if( !unique_key_exists( 'language_rfc4646_to_iso639', 'uniq_code' ) ) { + + $dbh->do(q{ + DELETE a + FROM language_rfc4646_to_iso639 AS a, language_rfc4646_to_iso639 AS b + WHERE a.id < b.id + AND a.rfc4646_subtag IS NOT NULL + AND a.rfc4646_subtag=b.rfc4646_subtag + AND a.iso639_2_code=b.iso639_2_code + }); $dbh->do(q{ ALTER TABLE language_rfc4646_to_iso639 ADD UNIQUE KEY uniq_code (rfc4646_subtag, iso639_2_code) -- 2.39.5