X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;ds=sidebyside;f=includes%2Finstaller%2FMysqlUpdater.php;h=e453b0113a1505440b2180c60386ec578af4a9ae;hb=5fedb004f90f1328ad7a63eb31e048b1c6d6f9e0;hp=c3186f21c873f54174d8d679b0d4d1b4b77a8d95;hpb=274d317a0ca2777a5c5fae2007c53811397540f5;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index c3186f21c8..e453b0113a 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -2,6 +2,21 @@ /** * MySQL-specific updater. * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation; either version 2 of the License, or + * (at your option) any later version. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License along + * with this program; if not, write to the Free Software Foundation, Inc., + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. + * http://www.gnu.org/copyleft/gpl.html + * * @file * @ingroup Deployment */ @@ -66,7 +81,6 @@ class MysqlUpdater extends DatabaseUpdater { array( 'addTable', 'user_newtalk', 'patch-usernewtalk2.sql' ), array( 'addTable', 'transcache', 'patch-transcache.sql' ), array( 'addField', 'interwiki', 'iw_trans', 'patch-interwiki-trans.sql' ), - array( 'addTable', 'trackbacks', 'patch-trackbacks.sql' ), // 1.6 array( 'doWatchlistNull' ), @@ -158,23 +172,47 @@ class MysqlUpdater extends DatabaseUpdater { array( 'doUpdateTranscacheField' ), array( 'renameEuWikiId' ), array( 'doUpdateMimeMinorField' ), - array( 'doPopulateRevLen' ), // 1.17 array( 'addTable', 'iwlinks', 'patch-iwlinks.sql' ), array( 'addIndex', 'iwlinks', 'iwl_prefix_title_from', 'patch-rename-iwl_prefix.sql' ), - array( 'addField', 'updatelog', 'ul_value', 'patch-ul_value.sql' ), + array( 'addField', 'updatelog', 'ul_value', 'patch-ul_value.sql' ), array( 'addField', 'interwiki', 'iw_api', 'patch-iw_api_and_wikiid.sql' ), - array( 'dropIndex', 'iwlinks', 'iwl_prefix', 'patch-kill-iwl_prefix.sql' ), - array( 'dropIndex', 'iwlinks', 'iwl_prefix_from_title', 'patch-kill-iwl_pft.sql' ), - array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ), + array( 'dropIndex', 'iwlinks', 'iwl_prefix', 'patch-kill-iwl_prefix.sql' ), + array( 'dropIndex', 'iwlinks', 'iwl_prefix_from_title', 'patch-kill-iwl_pft.sql' ), + array( 'addField', 'categorylinks', 'cl_collation', 'patch-categorylinks-better-collation.sql' ), array( 'doClFieldsUpdate' ), array( 'doCollationUpdate' ), array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ), array( 'addTable', 'module_deps', 'patch-module_deps.sql' ), - array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), - array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), + array( 'dropIndex', 'archive', 'ar_page_revid', 'patch-archive_kill_ar_page_revid.sql' ), + array( 'addIndex', 'archive', 'ar_revid', 'patch-archive_ar_revid.sql' ), array( 'doLangLinksLengthUpdate' ), + + // 1.18 + array( 'doUserNewTalkTimestampNotNull' ), + array( 'addIndex', 'user', 'user_email', 'patch-user_email_index.sql' ), + array( 'modifyField', 'user_properties', 'up_property', 'patch-up_property.sql' ), + array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ), + array( 'addTable', 'user_former_groups', 'patch-user_former_groups.sql'), + + // 1.19 + array( 'addIndex', 'logging', 'type_action', 'patch-logging-type-action-index.sql'), + array( 'doMigrateUserOptions' ), + array( 'dropField', 'user', 'user_options', 'patch-drop-user_options.sql' ), + 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( 'addTable', 'config', 'patch-config.sql' ), + array( 'addIndex', 'revision', 'page_user_timestamp', 'patch-revision-user-page-index.sql' ), + array( 'addField', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id.sql' ), + array( 'addIndex', 'ipblocks', 'ipb_parent_block_id', 'patch-ipb-parent-block-id-index.sql' ), ); } @@ -196,7 +234,7 @@ class MysqlUpdater extends DatabaseUpdater { } else { $this->output( "Fixing $field encoding on $table table... " ); $this->applyPatch( $patchFile ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } } @@ -213,12 +251,12 @@ class MysqlUpdater extends DatabaseUpdater { if ( $info ) { foreach ( $info as $row ) { if ( $row->Column_name == $field ) { - $this->output( "...index $index on table $table includes field $field\n" ); + $this->output( "...index $index on table $table includes field $field.\n" ); return true; } } } - $this->output( "...index $index on table $table has no field $field; adding\n" ); + $this->output( "...index $index on table $table has no field $field; added.\n" ); return false; } @@ -228,17 +266,17 @@ class MysqlUpdater extends DatabaseUpdater { protected function doInterwikiUpdate() { global $IP; - if ( $this->db->tableExists( "interwiki" ) ) { + if ( $this->db->tableExists( "interwiki", __METHOD__ ) ) { $this->output( "...already have interwiki table\n" ); return; } $this->output( 'Creating interwiki table...' ); $this->applyPatch( 'patch-interwiki.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); $this->output( 'Adding default interwiki definitions...' ); $this->applyPatch( "$IP/maintenance/interwiki.sql", true ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } /** @@ -246,14 +284,17 @@ class MysqlUpdater extends DatabaseUpdater { */ protected function doIndexUpdate() { $meta = $this->db->fieldInfo( 'recentchanges', 'rc_timestamp' ); + if ( $meta === false ) { + throw new MWException( 'Missing rc_timestamp field of recentchanges table. Should not happen.' ); + } if ( $meta->isMultipleKey() ) { - $this->output( "...indexes seem up to 20031107 standards\n" ); + $this->output( "...indexes seem up to 20031107 standards.\n" ); return; } $this->output( "Updating indexes to 20031107..." ); $this->applyPatch( 'patch-indexes.sql', true ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } protected function doOldLinksUpdate() { @@ -271,7 +312,7 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Fixing ancient broken imagelinks table.\n" ); $this->output( "NOTE: you will have to run maintenance/refreshLinks.php after this.\n" ); $this->applyPatch( 'patch-fix-il_from.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } /** @@ -281,7 +322,7 @@ class MysqlUpdater extends DatabaseUpdater { $talk = $this->db->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', __METHOD__ ); $nontalk = $this->db->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', __METHOD__ ); if ( $talk == $nontalk ) { - $this->output( "...watchlist talk page rows already present\n" ); + $this->output( "...watchlist talk page rows already present.\n" ); return; } @@ -293,11 +334,11 @@ class MysqlUpdater extends DatabaseUpdater { 'wl_title' => 'wl_title', 'wl_notificationtimestamp' => 'wl_notificationtimestamp' ), array( 'NOT (wl_namespace & 1)' ), __METHOD__, 'IGNORE' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } function doSchemaRestructuring() { - if ( $this->db->tableExists( 'page' ) ) { + if ( $this->db->tableExists( 'page', __METHOD__ ) ) { $this->output( "...page table already exists.\n" ); return; } @@ -482,20 +523,20 @@ class MysqlUpdater extends DatabaseUpdater { } else { $this->output( "Promoting $field from $info->Type to int... " ); $this->db->query( "ALTER TABLE $tablename MODIFY $field int NOT NULL", __METHOD__ ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } } } protected function doPagelinksUpdate() { - if ( $this->db->tableExists( 'pagelinks' ) ) { + if ( $this->db->tableExists( 'pagelinks', __METHOD__ ) ) { $this->output( "...already have pagelinks table.\n" ); return; } $this->output( "Converting links and brokenlinks tables to pagelinks... " ); $this->applyPatch( 'patch-pagelinks.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); global $wgContLang; foreach ( MWNamespace::getCanonicalNamespaces() as $ns => $name ) { @@ -517,7 +558,7 @@ class MysqlUpdater extends DatabaseUpdater { AND pl_title LIKE '$likeprefix:%'"; $this->db->query( $sql, __METHOD__ ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } } @@ -533,22 +574,22 @@ class MysqlUpdater extends DatabaseUpdater { } $this->output( "Adding unique index on user_name... " ); $this->applyPatch( 'patch-user_nameindex.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } protected function doUserGroupsUpdate() { - if ( $this->db->tableExists( 'user_groups' ) ) { + if ( $this->db->tableExists( 'user_groups', __METHOD__ ) ) { $info = $this->db->fieldInfo( 'user_groups', 'ug_group' ); if ( $info->type() == 'int' ) { $oldug = $this->db->tableName( 'user_groups' ); $newug = $this->db->tableName( 'user_groups_bogus' ); $this->output( "user_groups table exists but is in bogus intermediate format. Renaming to $newug... " ); $this->db->query( "ALTER TABLE $oldug RENAME TO $newug", __METHOD__ ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); $this->output( "Re-adding fresh user_groups table... " ); $this->applyPatch( 'patch-user_groups.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); $this->output( "***\n" ); $this->output( "*** WARNING: You will need to manually fix up user permissions in the user_groups\n" ); @@ -562,13 +603,13 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Adding user_groups table... " ); $this->applyPatch( 'patch-user_groups.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); - if ( !$this->db->tableExists( 'user_rights' ) ) { - if ( $this->db->fieldExists( 'user', 'user_rights' ) ) { + if ( !$this->db->tableExists( 'user_rights', __METHOD__ ) ) { + if ( $this->db->fieldExists( 'user', 'user_rights', __METHOD__ ) ) { $this->output( "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion..." ); $this->db->applyPatch( 'patch-user_rights.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } else { $this->output( "*** WARNING: couldn't locate user_rights table or field for upgrade.\n" ); $this->output( "*** You may need to manually configure some sysops by manipulating\n" ); @@ -596,7 +637,7 @@ class MysqlUpdater extends DatabaseUpdater { __METHOD__ ); } } - $this->output( "ok\n" ); + $this->output( "done.\n" ); } /** @@ -612,7 +653,7 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Making wl_notificationtimestamp nullable... " ); $this->applyPatch( 'patch-watchlist-null.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } /** @@ -633,7 +674,7 @@ class MysqlUpdater extends DatabaseUpdater { } protected function doTemplatelinksUpdate() { - if ( $this->db->tableExists( 'templatelinks' ) ) { + if ( $this->db->tableExists( 'templatelinks', __METHOD__ ) ) { $this->output( "...templatelinks table already exists\n" ); return; } @@ -649,7 +690,7 @@ class MysqlUpdater extends DatabaseUpdater { foreach ( $res as $row ) { $count = ( $count + 1 ) % 100; if ( $count == 0 ) { - wfWaitForSlaves( 10 ); + wfWaitForSlaves(); } $this->db->insert( 'templatelinks', array( @@ -691,7 +732,7 @@ class MysqlUpdater extends DatabaseUpdater { * -- Andrew Garrett, January 2007. */ protected function doRestrictionsUpdate() { - if ( $this->db->tableExists( 'page_restrictions' ) ) { + if ( $this->db->tableExists( 'page_restrictions', __METHOD__ ) ) { $this->output( "...page_restrictions table already exists.\n" ); return; } @@ -699,7 +740,7 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Creating page_restrictions table..." ); $this->applyPatch( 'patch-page_restrictions.sql' ); $this->applyPatch( 'patch-page_restrictions_sortkey.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); $this->output( "Migrating old restrictions to new table...\n" ); $task = $this->maintenance->runChild( 'UpdateRestrictions' ); @@ -731,32 +772,35 @@ class MysqlUpdater extends DatabaseUpdater { } protected function doPopulateParentId() { - if ( $this->updateRowExists( 'populate rev_parent_id' ) ) { - $this->output( "...rev_parent_id column already populated.\n" ); - return; - } + if ( !$this->updateRowExists( 'populate rev_parent_id' ) ) { + $this->output( + "Populating rev_parent_id fields, printing progress markers. For large\n" . + "databases, you may want to hit Ctrl-C and do this manually with\n" . + "maintenance/populateParentId.php.\n" ); - $task = $this->maintenance->runChild( 'PopulateParentId' ); - $task->execute(); + $task = $this->maintenance->runChild( 'PopulateParentId' ); + $task->execute(); + } } protected function doMaybeProfilingMemoryUpdate() { - if ( !$this->db->tableExists( 'profiling' ) ) { + if ( !$this->db->tableExists( 'profiling', __METHOD__ ) ) { // Simply ignore - } elseif ( $this->db->fieldExists( 'profiling', 'pf_memory' ) ) { + } elseif ( $this->db->fieldExists( 'profiling', 'pf_memory', __METHOD__ ) ) { $this->output( "...profiling table has pf_memory field.\n" ); } else { $this->output( "Adding pf_memory field to table profiling..." ); $this->applyPatch( 'patch-profiling-memory.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } } protected function doFilearchiveIndicesUpdate() { $info = $this->db->indexInfo( 'filearchive', 'fa_user_timestamp', __METHOD__ ); if ( !$info ) { + $this->output( "Updating filearchive indices..." ); $this->applyPatch( 'patch-filearchive-user-index.sql' ); - $this->output( "...filearchive indices updated\n" ); + $this->output( "done.\n" ); } } @@ -769,18 +813,18 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Making pl_namespace, tl_namespace and il_to indices UNIQUE... " ); $this->applyPatch( 'patch-pl-tl-il-unique.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } protected function renameEuWikiId() { - if ( $this->db->fieldExists( 'external_user', 'eu_local_id' ) ) { + if ( $this->db->fieldExists( 'external_user', 'eu_local_id', __METHOD__ ) ) { $this->output( "...eu_wiki_id already renamed to eu_local_id.\n" ); return; } $this->output( "Renaming eu_wiki_id -> eu_local_id... " ); $this->applyPatch( 'patch-eu_local_id.sql' ); - $this->output( "ok\n" ); + $this->output( "done.\n" ); } protected function doUpdateMimeMinorField() { @@ -791,17 +835,7 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "Altering all *_mime_minor fields to 100 bytes in size ... " ); $this->applyPatch( 'patch-mime_minor_length.sql' ); - $this->output( "ok\n" ); - } - - protected function doPopulateRevLen() { - if ( $this->updateRowExists( 'populate rev_len' ) ) { - $this->output( "...rev_len column already populated.\n" ); - return; - } - - $task = $this->maintenance->runChild( 'PopulateRevisionLength' ); - $task->execute(); + $this->output( "done.\n" ); } protected function doClFieldsUpdate() { @@ -828,4 +862,16 @@ class MysqlUpdater extends DatabaseUpdater { $this->output( "...ll_lang is up-to-date.\n" ); } } + + protected function doUserNewTalkTimestampNotNull() { + $info = $this->db->fieldInfo( 'user_newtalk', 'user_last_timestamp' ); + if ( $info->isNullable() ) { + $this->output( "...user_last_timestamp is already nullable.\n" ); + return; + } + + $this->output( "Making user_last_timestamp nullable... " ); + $this->applyPatch( 'patch-user-newtalk-timestamp-null.sql' ); + $this->output( "done.\n" ); + } }