Per bug 25503 comment #11, use varbinary instead of varchar for ResourceLoader-relate...

diff --git a/maintenance/archives/patch-module_deps.sql b/maintenance/archives/patch-module_deps.sql
index 8cea5a1..ffc9482 100644 (file)
--- 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 51457ec..f4f3533 100644 (file)
--- 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 b68e888..6a8dbf1 100644 (file)
--- 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*/;