From: Timo Tijhof Date: Fri, 6 Nov 2015 23:43:44 +0000 (+0000) Subject: resourceloader: Remove obsolete msg_resource_links table X-Git-Tag: 1.31.0-rc.0~8690^2 X-Git-Url: http://git.cyclocoop.org/%22%20.%20generer_url_ecrire%28%22articles%22%2C%22id_article=%24ze_article%22%29%20.%20%22?a=commitdiff_plain;h=cbf5bacae5f1a81854cd41bee34bee1ac3a76f49;p=lhc%2Fweb%2Fwiklou.git resourceloader: Remove obsolete msg_resource_links table No longer used as of Ia9131f570. Change-Id: If009e2620e59002e127d21b90a96bdd29e5d2a9d --- diff --git a/RELEASE-NOTES-1.27 b/RELEASE-NOTES-1.27 index ab136b1f93..0dbcc66b9e 100644 --- a/RELEASE-NOTES-1.27 +++ b/RELEASE-NOTES-1.27 @@ -174,6 +174,7 @@ changes to languages because of Phabricator reports. * wfBaseConvert() marked as deprecated, use Wikimedia\base_convert() directly instead. * Obsolete maintenance scripts clearCacheStats.php and showCacheStats.php were removed. The underlying data is sent to StatsD (see $wgStatsdServer). +* Removed msg_resource_links database table and associated code. == Compatibility == diff --git a/includes/installer/MssqlUpdater.php b/includes/installer/MssqlUpdater.php index 164cfab499..308f7b0339 100644 --- a/includes/installer/MssqlUpdater.php +++ b/includes/installer/MssqlUpdater.php @@ -64,6 +64,9 @@ class MssqlUpdater extends DatabaseUpdater { 'patch-oi_major_mime-chemical.sql' ), array( 'modifyField', 'filearchive', 'fa_major_mime', 'patch-fa_major_mime-chemical.sql' ), + + // 1.27 + array( 'dropTable', 'msg_resource_links' ), ); } diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index aa60c01b5b..f7beb7c662 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -275,6 +275,9 @@ class MysqlUpdater extends DatabaseUpdater { array( 'dropTable', 'hitcounter' ), array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), + + // 1.27 + array( 'dropTable', 'msg_resource_links' ), ); } diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index 03dbd1ce9c..d82009de26 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -108,6 +108,9 @@ class OracleUpdater extends DatabaseUpdater { array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), + // 1.27 + array( 'dropTable', 'msg_resource_links' ), + // KEEP THIS AT THE BOTTOM!! array( 'doRebuildDuplicateFunction' ), diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index 87e6566fd7..966f503a3e 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -86,7 +86,6 @@ class PostgresUpdater extends DatabaseUpdater { array( 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ), array( 'addTable', 'iwlinks', 'patch-iwlinks.sql' ), array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ), - array( 'addTable', 'msg_resource_links', 'patch-msg_resource_links.sql' ), array( 'addTable', 'module_deps', 'patch-module_deps.sql' ), array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql' ), @@ -424,7 +423,10 @@ class PostgresUpdater extends DatabaseUpdater { array( 'dropTable', 'hitcounter' ), array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), - array( 'dropFkey', 'recentchanges', 'rc_cur_id' ) + array( 'dropFkey', 'recentchanges', 'rc_cur_id' ), + + // 1.27 + array( 'dropTable', 'msg_resource_links' ), ); } diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 0de1fd7cc4..9f992ecd44 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -144,6 +144,9 @@ class SqliteUpdater extends DatabaseUpdater { array( 'dropField', 'site_stats', 'ss_total_views', 'patch-drop-ss_total_views.sql' ), array( 'dropField', 'page', 'page_counter', 'patch-drop-page_counter.sql' ), array( 'modifyField', 'filearchive', 'fa_deleted_reason', 'patch-editsummary-length.sql' ), + + // 1.27 + array( 'dropTable', 'msg_resource_links' ), ); } diff --git a/maintenance/archives/patch-msg_resource.sql b/maintenance/archives/patch-msg_resource.sql index b0bbdd009c..c2ede128be 100644 --- a/maintenance/archives/patch-msg_resource.sql +++ b/maintenance/archives/patch-msg_resource.sql @@ -10,11 +10,3 @@ CREATE TABLE /*_*/msg_resource ( mr_timestamp binary(14) NOT NULL ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource(mr_resource, mr_lang); - --- Table for administering which message is contained in which resource -CREATE TABLE /*_*/msg_resource_links ( - mrl_resource varbinary(255) NOT NULL, - -- Message key - mrl_message varbinary(255) NOT NULL -) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/mrl_message_resource ON /*_*/msg_resource_links (mrl_message, mrl_resource); diff --git a/maintenance/mssql/tables.sql b/maintenance/mssql/tables.sql index a192db77f0..d51e00906b 100644 --- a/maintenance/mssql/tables.sql +++ b/maintenance/mssql/tables.sql @@ -1237,14 +1237,6 @@ CREATE TABLE /*_*/msg_resource ( ); CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource (mr_resource, mr_lang); --- Table for administering which message is contained in which resource -CREATE TABLE /*_*/msg_resource_links ( - mrl_resource varbinary(255) NOT NULL, - -- Message key - mrl_message varbinary(255) NOT NULL -); -CREATE UNIQUE INDEX /*i*/mrl_message_resource ON /*_*/msg_resource_links (mrl_message, mrl_resource); - -- Table caching which local files a module depends on that aren't -- registered directly, used for fast retrieval of file dependency. -- Currently only used for tracking images that CSS depends on diff --git a/maintenance/oracle/archives/patch_16_17_schema_changes.sql b/maintenance/oracle/archives/patch_16_17_schema_changes.sql index cd99f7cc07..ecfc05536b 100644 --- a/maintenance/oracle/archives/patch_16_17_schema_changes.sql +++ b/maintenance/oracle/archives/patch_16_17_schema_changes.sql @@ -56,12 +56,6 @@ CREATE TABLE &mw_prefix.module_deps ( ); CREATE UNIQUE INDEX &mw_prefix.module_deps_u01 ON &mw_prefix.module_deps (md_module, md_skin); -CREATE TABLE &mw_prefix.msg_resource_links ( - mrl_resource VARCHAR2(255) NOT NULL, - mrl_message VARCHAR2(255) NOT NULL -); -CREATE UNIQUE INDEX &mw_prefix.msg_resource_links_u01 ON &mw_prefix.msg_resource_links (mrl_message, mrl_resource); - CREATE TABLE &mw_prefix.msg_resource ( mr_resource VARCHAR2(255) NOT NULL, mr_lang varchar2(32) NOT NULL, diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index a332c41862..3ab2d064bc 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -667,12 +667,6 @@ CREATE TABLE &mw_prefix.msg_resource ( ); CREATE UNIQUE INDEX &mw_prefix.msg_resource_u01 ON &mw_prefix.msg_resource (mr_resource, mr_lang); -CREATE TABLE &mw_prefix.msg_resource_links ( - mrl_resource VARCHAR2(255) NOT NULL, - mrl_message VARCHAR2(255) NOT NULL -); -CREATE UNIQUE INDEX &mw_prefix.msg_resource_links_u01 ON &mw_prefix.msg_resource_links (mrl_message, mrl_resource); - CREATE TABLE &mw_prefix.module_deps ( md_module VARCHAR2(255) NOT NULL, md_skin VARCHAR2(32) NOT NULL, diff --git a/maintenance/postgres/archives/patch-msg_resource_links.sql b/maintenance/postgres/archives/patch-msg_resource_links.sql deleted file mode 100644 index 88109da3c9..0000000000 --- a/maintenance/postgres/archives/patch-msg_resource_links.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE TABLE msg_resource_links ( - mrl_resource TEXT NOT NULL, - mrl_message TEXT NOT NULL -); - -CREATE UNIQUE INDEX mrl_message_resource ON msg_resource_links (mrl_message, mrl_resource); diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 60762063d4..58fd61be45 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -698,12 +698,6 @@ CREATE TABLE msg_resource ( ); CREATE UNIQUE INDEX mr_resource_lang ON msg_resource (mr_resource, mr_lang); -CREATE TABLE msg_resource_links ( - mrl_resource TEXT NOT NULL, - mrl_message TEXT NOT NULL -); -CREATE UNIQUE INDEX mrl_message_resource ON msg_resource_links (mrl_message, mrl_resource); - CREATE TABLE module_deps ( md_module TEXT NOT NULL, md_skin TEXT NOT NULL, diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 35e7ec2df4..3f143b2c4d 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1509,14 +1509,6 @@ CREATE TABLE /*_*/msg_resource ( ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource (mr_resource, mr_lang); --- Table for administering which message is contained in which resource -CREATE TABLE /*_*/msg_resource_links ( - mrl_resource varbinary(255) NOT NULL, - -- Message key - mrl_message varbinary(255) NOT NULL -) /*$wgDBTableOptions*/; -CREATE UNIQUE INDEX /*i*/mrl_message_resource ON /*_*/msg_resource_links (mrl_message, mrl_resource); - -- Table caching which local files a module depends on that aren't -- registered directly, used for fast retrieval of file dependency. -- Currently only used for tracking images that CSS depends on diff --git a/tests/parser/parserTest.inc b/tests/parser/parserTest.inc index f29e8b89f5..e09a5852bd 100644 --- a/tests/parser/parserTest.inc +++ b/tests/parser/parserTest.inc @@ -964,7 +964,7 @@ class ParserTest { 'site_stats', 'ipblocks', 'image', 'oldimage', 'recentchanges', 'watchlist', 'interwiki', 'logging', 'querycache', 'objectcache', 'job', 'l10n_cache', 'redirect', 'querycachetwo', - 'archive', 'user_groups', 'page_props', 'category', 'msg_resource', 'msg_resource_links' + 'archive', 'user_groups', 'page_props', 'category', 'msg_resource' ); if ( in_array( $this->db->getType(), array( 'mysql', 'sqlite', 'oracle' ) ) ) {