From 575a886a466bab5ffb255c936e16999eacea167c Mon Sep 17 00:00:00 2001 From: Reedy Date: Fri, 1 Sep 2017 17:39:50 +0100 Subject: [PATCH] Remove patch-log_search-rename-index.sql from MW 1.16 updaters Otherwise, the PK on log_search keeps getting dropped, ls_field_val readded and this is then repeated on every run of update.php Change-Id: I6b00933c29b5e24ec2833001fcf45053292d190c Follows-up: Id635297838938c7c5dfe65d45285a4d16d65152d --- includes/installer/MysqlUpdater.php | 1 - includes/installer/SqliteUpdater.php | 1 - maintenance/archives/patch-log_search-rename-index.sql | 7 ------- .../sqlite/archives/patch-log_search-rename-index.sql | 1 - 4 files changed, 10 deletions(-) delete mode 100644 maintenance/archives/patch-log_search-rename-index.sql delete mode 100644 maintenance/sqlite/archives/patch-log_search-rename-index.sql diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index c5919749aa..b42ae4661a 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -170,7 +170,6 @@ class MysqlUpdater extends DatabaseUpdater { [ 'doLogUsertextPopulation' ], [ 'doLogSearchPopulation' ], [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], - [ 'addIndex', 'log_search', 'ls_field_val', 'patch-log_search-rename-index.sql' ], [ 'addIndex', 'change_tag', 'change_tag_rc_tag', 'patch-change_tag-indexes.sql' ], [ 'addField', 'redirect', 'rd_interwiki', 'patch-rd_interwiki.sql' ], [ 'doUpdateTranscacheField' ], diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index e79dcb189c..d0ed822397 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -54,7 +54,6 @@ class SqliteUpdater extends DatabaseUpdater { [ 'doLogUsertextPopulation' ], [ 'doLogSearchPopulation' ], [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], - [ 'addIndex', 'log_search', 'ls_field_val', 'patch-log_search-rename-index.sql' ], [ 'addIndex', 'change_tag', 'change_tag_rc_tag', 'patch-change_tag-indexes.sql' ], [ 'addField', 'redirect', 'rd_interwiki', 'patch-rd_interwiki.sql' ], [ 'doUpdateTranscacheField' ], diff --git a/maintenance/archives/patch-log_search-rename-index.sql b/maintenance/archives/patch-log_search-rename-index.sql deleted file mode 100644 index 7e1113e6e2..0000000000 --- a/maintenance/archives/patch-log_search-rename-index.sql +++ /dev/null @@ -1,7 +0,0 @@ --- Rename the primary unique index from PRIMARY to ls_field_val --- This is for MySQL only and is necessary only for databases which were updated --- between MW 1.16 development revisions r50567 and r51465. -ALTER TABLE /*_*/log_search - DROP PRIMARY KEY, - ADD UNIQUE INDEX ls_field_val (ls_field,ls_value,ls_log_id); - diff --git a/maintenance/sqlite/archives/patch-log_search-rename-index.sql b/maintenance/sqlite/archives/patch-log_search-rename-index.sql deleted file mode 100644 index 4b98a0f2ef..0000000000 --- a/maintenance/sqlite/archives/patch-log_search-rename-index.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE UNIQUE INDEX ls_field_val ON /*_*/log_search (ls_field,ls_value,ls_log_id); -- 2.20.1