From 7dd7c71cb596bd625683cba5587476f157a3cf15 Mon Sep 17 00:00:00 2001 From: Roan Kattouw Date: Fri, 5 Nov 2010 22:15:58 +0000 Subject: [PATCH] Per bug 25503 comment #11, use varbinary instead of varchar for ResourceLoader-related tables to avoid errors about indexes being too long. Only really needed for msg_resource_links, changed the rest for consistency. No updater needed: anyone who's already gotten this set up without these errors doesn't need this change. --- maintenance/archives/patch-module_deps.sql | 4 ++-- maintenance/archives/patch-msg_resource.sql | 6 +++--- maintenance/tables.sql | 10 +++++----- 3 files changed, 10 insertions(+), 10 deletions(-) diff --git a/maintenance/archives/patch-module_deps.sql b/maintenance/archives/patch-module_deps.sql index 8cea5a110b..ffc94829db 100644 --- a/maintenance/archives/patch-module_deps.sql +++ b/maintenance/archives/patch-module_deps.sql @@ -3,9 +3,9 @@ -- Currently only used for tracking images that CSS depends on CREATE TABLE /*_*/module_deps ( -- Module name - md_module varchar(255) NOT NULL, + md_module varbinary(255) NOT NULL, -- Skin name - md_skin varchar(32) NOT NULL, + md_skin varbinary(32) NOT NULL, -- JSON blob with file dependencies md_deps mediumblob NOT NULL ) /*$wgDBTableOptions*/; diff --git a/maintenance/archives/patch-msg_resource.sql b/maintenance/archives/patch-msg_resource.sql index 51457ec18c..f4f35339b9 100644 --- a/maintenance/archives/patch-msg_resource.sql +++ b/maintenance/archives/patch-msg_resource.sql @@ -1,7 +1,7 @@ -- Table for storing JSON message blobs for the resource loader CREATE TABLE /*_*/msg_resource ( -- Resource name - mr_resource varchar(255) NOT NULL, + mr_resource varbinary(255) NOT NULL, -- Language code mr_lang varbinary(32) NOT NULL, -- JSON blob. This is an incomplete JSON object, i.e. without the wrapping {} @@ -13,8 +13,8 @@ CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource(mr_resource, mr_l -- Table for administering which message is contained in which resource CREATE TABLE /*_*/msg_resource_links ( - mrl_resource varchar(255) NOT NULL, + mrl_resource varbinary(255) NOT NULL, -- Message key - mrl_message varchar(255) NOT NULL + 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/tables.sql b/maintenance/tables.sql index b68e88853f..6a8dbf11af 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1397,7 +1397,7 @@ CREATE INDEX /*i*/lc_lang_key ON /*_*/l10n_cache (lc_lang, lc_key); -- Table for storing JSON message blobs for the resource loader CREATE TABLE /*_*/msg_resource ( -- Resource name - mr_resource varchar(255) NOT NULL, + mr_resource varbinary(255) NOT NULL, -- Language code mr_lang varbinary(32) NOT NULL, -- JSON blob @@ -1409,9 +1409,9 @@ CREATE UNIQUE INDEX /*i*/mr_resource_lang ON /*_*/msg_resource (mr_resource, mr_ -- Table for administering which message is contained in which resource CREATE TABLE /*_*/msg_resource_links ( - mrl_resource varchar(255) NOT NULL, + mrl_resource varbinary(255) NOT NULL, -- Message key - mrl_message varchar(255) NOT NULL + mrl_message varbinary(255) NOT NULL ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/mrl_message_resource ON /*_*/msg_resource_links (mrl_message, mrl_resource); @@ -1420,9 +1420,9 @@ CREATE UNIQUE INDEX /*i*/mrl_message_resource ON /*_*/msg_resource_links (mrl_me -- Currently only used for tracking images that CSS depends on CREATE TABLE /*_*/module_deps ( -- Module name - md_module varchar(255) NOT NULL, + md_module varbinary(255) NOT NULL, -- Skin name - md_skin varchar(32) NOT NULL, + md_skin varbinary(32) NOT NULL, -- JSON blob with file dependencies md_deps mediumblob NOT NULL ) /*$wgDBTableOptions*/; -- 2.20.1