From 0c5301a0d1dfc82088c67873553506411e2943e6 Mon Sep 17 00:00:00 2001 From: Reedy Date: Wed, 2 Jan 2013 20:20:22 +0000 Subject: [PATCH] Bug 11057 - Increase size of ug_group in user_groups table Change-Id: I79fd5c6e1566de3145ac39420da4fce77099745a --- includes/installer/MysqlUpdater.php | 4 ++-- includes/installer/OracleUpdater.php | 4 ++-- includes/installer/SqliteUpdater.php | 4 ++-- .../archives/patch-ufg_group-length-increase-255.sql | 2 ++ .../archives/patch-ufg_group-length-increase.sql | 2 -- .../archives/patch-ug_group-length-increase-255.sql | 2 ++ .../archives/patch-ug_group-length-increase.sql | 2 -- maintenance/archives/patch-user_former_groups.sql | 2 +- ...ase.sql => patch-ufg_group-length-increase-255.sql} | 2 +- ...ease.sql => patch-ug_group-length-increase-255.sql} | 2 +- .../oracle/archives/patch-user_former_groups.sql | 2 +- maintenance/oracle/tables.sql | 4 ++-- ...ase.sql => patch-ufg_group-length-increase-255.sql} | 10 +++++----- ...ease.sql => patch-ug_group-length-increase-255.sql} | 2 +- maintenance/tables.sql | 4 ++-- 15 files changed, 24 insertions(+), 24 deletions(-) create mode 100644 maintenance/archives/patch-ufg_group-length-increase-255.sql delete mode 100644 maintenance/archives/patch-ufg_group-length-increase.sql create mode 100644 maintenance/archives/patch-ug_group-length-increase-255.sql delete mode 100644 maintenance/archives/patch-ug_group-length-increase.sql rename maintenance/oracle/archives/{patch-ufg_group-length-increase.sql => patch-ufg_group-length-increase-255.sql} (83%) rename maintenance/oracle/archives/{patch-ug_group-length-increase.sql => patch-ug_group-length-increase-255.sql} (86%) rename maintenance/sqlite/archives/{patch-ufg_group-length-increase.sql => patch-ufg_group-length-increase-255.sql} (58%) rename maintenance/sqlite/archives/{patch-ug_group-length-increase.sql => patch-ug_group-length-increase-255.sql} (90%) diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index bbeb685c0a..469e9a4d37 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -203,10 +203,8 @@ class MysqlUpdater extends DatabaseUpdater { array( 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1.sql' ), array( 'addField', 'archive', 'ar_sha1', 'patch-ar_sha1.sql' ), array( 'addIndex', 'page', 'page_redirect_namespace_len', 'patch-page_redirect_namespace_len.sql' ), - array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ), array( 'addField', 'uploadstash', 'us_chunk_inx', 'patch-uploadstash_chunk.sql' ), array( 'addfield', 'job', 'job_timestamp', 'patch-jobs-add-timestamp.sql' ), - array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ), // 1.20 array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ), @@ -228,6 +226,8 @@ class MysqlUpdater extends DatabaseUpdater { array( 'addField', 'job', 'job_attempts', 'patch-job_attempts.sql' ), array( 'doEnableProfiling' ), array( 'addField', 'uploadstash', 'us_props', 'patch-uploadstash-us_props.sql' ), + array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase-255.sql' ), + array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase-255.sql' ), ); } diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index 86b52d6520..8f43a6d506 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -59,12 +59,10 @@ class OracleUpdater extends DatabaseUpdater { array( 'addField', 'archive', 'ar_sha1', 'patch-ar_sha1_field.sql' ), array( 'doRemoveNotNullEmptyDefaults2' ), array( 'addIndex', 'page', 'i03', 'patch-page_redirect_namespace_len.sql' ), - array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ), array( 'addField', 'uploadstash', 'us_chunk_inx', 'patch-us_chunk_inx_field.sql' ), array( 'addField', 'job', 'job_timestamp', 'patch-job_timestamp_field.sql' ), array( 'addIndex', 'job', 'i02', 'patch-job_timestamp_index.sql' ), array( 'doPageRestrictionsPKUKFix' ), - array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase.sql' ), //1.20 array( 'addIndex', 'ipblocks', 'i05', 'patch-ipblocks_i05_index.sql' ), @@ -84,6 +82,8 @@ class OracleUpdater extends DatabaseUpdater { array( 'addField', 'job', 'job_token', 'patch-job_token.sql' ), array( 'addField', 'job', 'job_attempts', 'patch-job_attempts.sql' ), array( 'addField', 'uploadstash', 'us_props', 'patch-uploadstash-us_props.sql' ), + array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase-255.sql' ), + array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase-255.sql' ), // KEEP THIS AT THE BOTTOM!! array( 'doRebuildDuplicateFunction' ), diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 1d6bca0a7a..b5cd640b7e 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -82,10 +82,8 @@ class SqliteUpdater extends DatabaseUpdater { array( 'addField', 'revision', 'rev_sha1', 'patch-rev_sha1.sql' ), array( 'addField', 'archive', 'ar_sha1', 'patch-ar_sha1.sql' ), array( 'addIndex', 'page', 'page_redirect_namespace_len', 'patch-page_redirect_namespace_len.sql' ), - array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase.sql' ), array( 'addField', 'uploadstash', 'us_chunk_inx', 'patch-uploadstash_chunk.sql' ), array( 'addfield', 'job', 'job_timestamp', 'patch-jobs-add-timestamp.sql' ), - array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ug_group-length-increase.sql' ), // 1.20 array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ), @@ -108,6 +106,8 @@ class SqliteUpdater extends DatabaseUpdater { array( 'addField', 'job', 'job_attempts', 'patch-job_attempts.sql' ), array( 'doEnableProfiling' ), array( 'addField', 'uploadstash', 'us_props', 'patch-uploadstash-us_props.sql' ), + array( 'modifyField', 'user_groups', 'ug_group', 'patch-ug_group-length-increase-255.sql' ), + array( 'modifyField', 'user_former_groups', 'ufg_group', 'patch-ufg_group-length-increase-255.sql' ), ); } diff --git a/maintenance/archives/patch-ufg_group-length-increase-255.sql b/maintenance/archives/patch-ufg_group-length-increase-255.sql new file mode 100644 index 0000000000..4b7f0d3870 --- /dev/null +++ b/maintenance/archives/patch-ufg_group-length-increase-255.sql @@ -0,0 +1,2 @@ +ALTER TABLE /*_*/user_former_groups + MODIFY COLUMN ufg_group varbinary(255) NOT NULL default ''; diff --git a/maintenance/archives/patch-ufg_group-length-increase.sql b/maintenance/archives/patch-ufg_group-length-increase.sql deleted file mode 100644 index e24cba0201..0000000000 --- a/maintenance/archives/patch-ufg_group-length-increase.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE /*_*/user_former_groups - MODIFY COLUMN ufg_group varbinary(32) NOT NULL default ''; diff --git a/maintenance/archives/patch-ug_group-length-increase-255.sql b/maintenance/archives/patch-ug_group-length-increase-255.sql new file mode 100644 index 0000000000..79e17ac0a4 --- /dev/null +++ b/maintenance/archives/patch-ug_group-length-increase-255.sql @@ -0,0 +1,2 @@ +ALTER TABLE /*_*/user_groups + MODIFY COLUMN ug_group varbinary(255) NOT NULL default ''; diff --git a/maintenance/archives/patch-ug_group-length-increase.sql b/maintenance/archives/patch-ug_group-length-increase.sql deleted file mode 100644 index e944a8584c..0000000000 --- a/maintenance/archives/patch-ug_group-length-increase.sql +++ /dev/null @@ -1,2 +0,0 @@ -ALTER TABLE /*_*/user_groups - MODIFY COLUMN ug_group varbinary(32) NOT NULL default ''; diff --git a/maintenance/archives/patch-user_former_groups.sql b/maintenance/archives/patch-user_former_groups.sql index 591c753bec..b043196df2 100644 --- a/maintenance/archives/patch-user_former_groups.sql +++ b/maintenance/archives/patch-user_former_groups.sql @@ -3,7 +3,7 @@ CREATE TABLE /*_*/user_former_groups ( -- Key to user_id ufg_user int unsigned NOT NULL default 0, - ufg_group varbinary(32) NOT NULL default '' + ufg_group varbinary(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/ufg_user_group ON /*_*/user_former_groups (ufg_user,ufg_group); diff --git a/maintenance/oracle/archives/patch-ufg_group-length-increase.sql b/maintenance/oracle/archives/patch-ufg_group-length-increase-255.sql similarity index 83% rename from maintenance/oracle/archives/patch-ufg_group-length-increase.sql rename to maintenance/oracle/archives/patch-ufg_group-length-increase-255.sql index a48b8bff04..6a4a751780 100644 --- a/maintenance/oracle/archives/patch-ufg_group-length-increase.sql +++ b/maintenance/oracle/archives/patch-ufg_group-length-increase-255.sql @@ -2,7 +2,7 @@ define mw_prefix='{$wgDBprefix}'; /*$mw$*/ BEGIN - EXECUTE IMMEDIATE 'ALTER TABLE &mw_prefix.user_former_groups MODIFY ufg_group VARCHAR2(32) NOT NULL'; + EXECUTE IMMEDIATE 'ALTER TABLE &mw_prefix.user_former_groups MODIFY ufg_group VARCHAR2(255) NOT NULL'; EXCEPTION WHEN OTHERS THEN IF (SQLCODE = -01442) THEN NULL; ELSE RAISE; END IF; END; diff --git a/maintenance/oracle/archives/patch-ug_group-length-increase.sql b/maintenance/oracle/archives/patch-ug_group-length-increase-255.sql similarity index 86% rename from maintenance/oracle/archives/patch-ug_group-length-increase.sql rename to maintenance/oracle/archives/patch-ug_group-length-increase-255.sql index 89e5532978..00a5e7b2a0 100644 --- a/maintenance/oracle/archives/patch-ug_group-length-increase.sql +++ b/maintenance/oracle/archives/patch-ug_group-length-increase-255.sql @@ -2,7 +2,7 @@ define mw_prefix='{$wgDBprefix}'; /*$mw$*/ BEGIN - EXECUTE IMMEDIATE 'ALTER TABLE &mw_prefix.user_groups MODIFY ug_group VARCHAR2(32) NOT NULL'; + EXECUTE IMMEDIATE 'ALTER TABLE &mw_prefix.user_groups MODIFY ug_group VARCHAR2(255) NOT NULL'; EXCEPTION WHEN OTHERS THEN IF (SQLCODE = -01442) THEN NULL; ELSE RAISE; END IF; END; diff --git a/maintenance/oracle/archives/patch-user_former_groups.sql b/maintenance/oracle/archives/patch-user_former_groups.sql index 59147eb2f4..c14824eb69 100644 --- a/maintenance/oracle/archives/patch-user_former_groups.sql +++ b/maintenance/oracle/archives/patch-user_former_groups.sql @@ -2,7 +2,7 @@ define mw_prefix='{$wgDBprefix}'; CREATE TABLE &mw_prefix.user_former_groups ( ufg_user NUMBER DEFAULT 0 NOT NULL, - ufg_group VARCHAR2(16) NOT NULL + ufg_group VARCHAR2(255) NOT NULL ); ALTER TABLE &mw_prefix.user_former_groups ADD CONSTRAINT &mw_prefix.user_former_groups_fk1 FOREIGN KEY (ufg_user) REFERENCES &mw_prefix.mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED; CREATE UNIQUE INDEX &mw_prefix.user_former_groups_u01 ON &mw_prefix.user_former_groups (ufg_user,ufg_group); diff --git a/maintenance/oracle/tables.sql b/maintenance/oracle/tables.sql index c3c3df9ae1..b5b3b07e60 100644 --- a/maintenance/oracle/tables.sql +++ b/maintenance/oracle/tables.sql @@ -31,7 +31,7 @@ INSERT INTO &mw_prefix.mwuser CREATE TABLE &mw_prefix.user_groups ( ug_user NUMBER DEFAULT 0 NOT NULL, - ug_group VARCHAR2(32) NOT NULL + ug_group VARCHAR2(255) NOT NULL ); ALTER TABLE &mw_prefix.user_groups ADD CONSTRAINT &mw_prefix.user_groups_fk1 FOREIGN KEY (ug_user) REFERENCES &mw_prefix.mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED; CREATE UNIQUE INDEX &mw_prefix.user_groups_u01 ON &mw_prefix.user_groups (ug_user,ug_group); @@ -39,7 +39,7 @@ CREATE INDEX &mw_prefix.user_groups_i01 ON &mw_prefix.user_groups (ug_group); CREATE TABLE &mw_prefix.user_former_groups ( ufg_user NUMBER DEFAULT 0 NOT NULL, - ufg_group VARCHAR2(16) NOT NULL + ufg_group VARCHAR2(255) NOT NULL ); ALTER TABLE &mw_prefix.user_former_groups ADD CONSTRAINT &mw_prefix.user_former_groups_fk1 FOREIGN KEY (ufg_user) REFERENCES &mw_prefix.mwuser(user_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED; CREATE UNIQUE INDEX &mw_prefix.user_former_groups_u01 ON &mw_prefix.user_former_groups (ufg_user,ufg_group); diff --git a/maintenance/sqlite/archives/patch-ufg_group-length-increase.sql b/maintenance/sqlite/archives/patch-ufg_group-length-increase-255.sql similarity index 58% rename from maintenance/sqlite/archives/patch-ufg_group-length-increase.sql rename to maintenance/sqlite/archives/patch-ufg_group-length-increase-255.sql index c6dcea5eff..edd0a3dc6a 100644 --- a/maintenance/sqlite/archives/patch-ufg_group-length-increase.sql +++ b/maintenance/sqlite/archives/patch-ufg_group-length-increase-255.sql @@ -1,11 +1,11 @@ -CREATE TABLE /*_*/user_former_groups_tmp ( - ug_user int unsigned NOT NULL default 0, - ug_group varbinary(32) NOT NULL default '' + CREATE TABLE /*_*/user_former_groups_tmp ( + ufg_user int unsigned NOT NULL default 0, + ufg_group varbinary(255) NOT NULL default '' ) /*$wgDBTableOptions*/; INSERT INTO /*_*/user_former_groups_tmp - SELECT ug_user, ug_group - FROM /*_*/user_groups; + SELECT ufg_user, ufg_group + FROM /*_*/user_former_groups; DROP TABLE /*_*/user_former_groups; diff --git a/maintenance/sqlite/archives/patch-ug_group-length-increase.sql b/maintenance/sqlite/archives/patch-ug_group-length-increase-255.sql similarity index 90% rename from maintenance/sqlite/archives/patch-ug_group-length-increase.sql rename to maintenance/sqlite/archives/patch-ug_group-length-increase-255.sql index 5e810937fe..3daeb7c604 100644 --- a/maintenance/sqlite/archives/patch-ug_group-length-increase.sql +++ b/maintenance/sqlite/archives/patch-ug_group-length-increase-255.sql @@ -1,6 +1,6 @@ CREATE TABLE /*_*/user_groups_tmp ( ug_user int unsigned NOT NULL default 0, - ug_group varbinary(32) NOT NULL default '' + ug_group varbinary(255) NOT NULL default '' ) /*$wgDBTableOptions*/; INSERT INTO /*_*/user_groups_tmp diff --git a/maintenance/tables.sql b/maintenance/tables.sql index c9a188bd60..14d74229e3 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -152,7 +152,7 @@ CREATE TABLE /*_*/user_groups ( -- with particular permissions. A user will have the combined -- permissions of any group they're explicitly in, plus -- the implicit '*' and 'user' groups. - ug_group varbinary(32) NOT NULL default '' + ug_group varbinary(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/ug_user_group ON /*_*/user_groups (ug_user,ug_group); @@ -164,7 +164,7 @@ CREATE INDEX /*i*/ug_group ON /*_*/user_groups (ug_group); CREATE TABLE /*_*/user_former_groups ( -- Key to user_id ufg_user int unsigned NOT NULL default 0, - ufg_group varbinary(32) NOT NULL default '' + ufg_group varbinary(255) NOT NULL default '' ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/ufg_user_group ON /*_*/user_former_groups (ufg_user,ufg_group); -- 2.20.1