From ddee4874f7c29726b770ed973b5b351417ba57e8 Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Sat, 19 Nov 2011 17:21:55 +0000 Subject: [PATCH] Followup r103685 Not sure why I reinvented the wheel. Oh well, doing it properly now --- includes/installer/DatabaseUpdater.php | 14 -------------- includes/installer/MysqlUpdater.php | 2 +- includes/installer/OracleUpdater.php | 2 +- includes/installer/SqliteUpdater.php | 2 +- 4 files changed, 3 insertions(+), 17 deletions(-) diff --git a/includes/installer/DatabaseUpdater.php b/includes/installer/DatabaseUpdater.php index 907c00f44f..36ed5c6151 100644 --- a/includes/installer/DatabaseUpdater.php +++ b/includes/installer/DatabaseUpdater.php @@ -666,18 +666,4 @@ abstract class DatabaseUpdater { $cl->execute(); $this->output( "Rebuilding localisation cache done.\n" ); } - - /** - * Increases the length of the user_group field - */ - protected function doIncreaseUserGroupLength() { - $this->output( 'Increasing the length of the user_group...' ); - if ( $this->updateRowExists( 'user_groups_length' ) ) { - $this->output( "...user_groups field is already long enough.\n" ); - return; - } - $this->applyPatch( 'patch-ug_group-length-increase.sql' ); - $this->insertUpdateRow( 'user_groups_length' ); - $this->output( "done.\n" ); - } } diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index f89fc71127..c66404478a 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -190,7 +190,7 @@ 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( 'doIncreaseUserGroupLength' ), + array( 'modifyField', 'user', 'ug_group', 'patch-ug_group-length-increase.sql' ), ); } diff --git a/includes/installer/OracleUpdater.php b/includes/installer/OracleUpdater.php index d1006b2fc3..1e6e4d2956 100644 --- a/includes/installer/OracleUpdater.php +++ b/includes/installer/OracleUpdater.php @@ -47,7 +47,7 @@ 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( 'doIncreaseUserGroupLength' ), + array( 'modifyField', 'user', 'ug_group', 'patch-ug_group-length-increase.sql' ), // till 2.0 i guess array( 'doRebuildDuplicateFunction' ), diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php index 34f866b6e2..dbca7253b7 100644 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@ -68,7 +68,7 @@ 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( 'doIncreaseUserGroupLength' ), + array( 'modifyField', 'user', 'ug_group', 'patch-ug_group-length-increase.sql' ), ); } -- 2.20.1