From: jenkins-bot Date: Fri, 27 Sep 2019 15:18:11 +0000 (+0000) Subject: Merge "Split down patch-comment-table.sql" X-Git-Tag: 1.34.0-rc.0~73 X-Git-Url: http://git.heureux-cyclage.org/?p=lhc%2Fweb%2Fwiklou.git;a=commitdiff_plain;h=825d66bfa44c5dae2b78e2fe4f3b16f16aff4a12;hp=-c Merge "Split down patch-comment-table.sql" --- 825d66bfa44c5dae2b78e2fe4f3b16f16aff4a12 diff --combined includes/installer/MysqlUpdater.php index a53a72b9d5,9df0b82cbe..f0519c7a03 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@@ -29,7 -29,6 +29,7 @@@ use MediaWiki\MediaWikiServices * * @ingroup Deployment * @since 1.17 + * @property Wikimedia\Rdbms\DatabaseMysqlBase $db */ class MysqlUpdater extends DatabaseUpdater { protected function getCoreUpdateList() { @@@ -101,10 -100,8 +101,10 @@@ [ 'addTable', 'querycache_info', 'patch-querycacheinfo.sql' ], [ 'addTable', 'filearchive', 'patch-filearchive.sql' ], [ 'addField', 'ipblocks', 'ipb_anon_only', 'patch-ipb_anon_only.sql' ], - [ 'addIndex', 'recentchanges', 'rc_ns_usertext', 'patch-recentchanges-utindex.sql' ], - [ 'addIndex', 'recentchanges', 'rc_user_text', 'patch-rc_user_text-index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'recentchanges', 'rc_ns_usertext', + 'patch-recentchanges-utindex.sql' ], + [ 'ifNoActorTable', 'addIndex', 'recentchanges', 'rc_user_text', + 'patch-rc_user_text-index.sql' ], // 1.9 [ 'addField', 'user', 'user_newpass_time', 'patch-user_newpass_time.sql' ], @@@ -132,12 -129,9 +132,12 @@@ [ 'addField', 'ipblocks', 'ipb_block_email', 'patch-ipb_emailban.sql' ], [ 'doCategorylinksIndicesUpdate' ], [ 'addField', 'oldimage', 'oi_metadata', 'patch-oi_metadata.sql' ], - [ 'addIndex', 'archive', 'usertext_timestamp', 'patch-archive-user-index.sql' ], - [ 'addIndex', 'image', 'img_usertext_timestamp', 'patch-image-user-index.sql' ], - [ 'addIndex', 'oldimage', 'oi_usertext_timestamp', 'patch-oldimage-user-index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'archive', 'usertext_timestamp', + 'patch-archive-user-index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'image', 'img_usertext_timestamp', + 'patch-image-user-index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'oldimage', 'oi_usertext_timestamp', + 'patch-oldimage-user-index.sql' ], [ 'addField', 'archive', 'ar_page_id', 'patch-archive-page_id.sql' ], [ 'addField', 'image', 'img_sha1', 'patch-img_sha1.sql' ], @@@ -145,7 -139,7 +145,7 @@@ [ 'addTable', 'protected_titles', 'patch-protected_titles.sql' ], // 1.13 - [ 'addField', 'ipblocks', 'ipb_by_text', 'patch-ipb_by_text.sql' ], + [ 'ifNoActorTable', 'addField', 'ipblocks', 'ipb_by_text', 'patch-ipb_by_text.sql' ], [ 'addTable', 'page_props', 'patch-page_props.sql' ], [ 'addTable', 'updatelog', 'patch-updatelog.sql' ], [ 'addTable', 'category', 'patch-category.sql' ], @@@ -155,7 -149,7 +155,7 @@@ [ 'doPopulateParentId' ], [ 'checkBin', 'protected_titles', 'pt_title', 'patch-pt_title-encoding.sql', ], [ 'doMaybeProfilingMemoryUpdate' ], - [ 'doFilearchiveIndicesUpdate' ], + [ 'ifNoActorTable', 'doFilearchiveIndicesUpdate' ], // 1.14 [ 'addField', 'site_stats', 'ss_active_users', 'patch-ss_active_users.sql' ], @@@ -168,9 -162,9 +168,9 @@@ // 1.16 [ 'addTable', 'user_properties', 'patch-user_properties.sql' ], [ 'addTable', 'log_search', 'patch-log_search.sql' ], - [ 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ], + [ 'ifNoActorTable', 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ], # listed separately from the previous update because 1.16 was released without this update - [ 'doLogUsertextPopulation' ], + [ 'ifNoActorTable', 'doLogUsertextPopulation' ], [ 'doLogSearchPopulation' ], [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], [ 'dropIndex', 'change_tag', 'ct_rc_id', 'patch-change_tag-indexes.sql' ], @@@ -245,10 -239,9 +245,10 @@@ // 1.23 [ 'addField', 'recentchanges', 'rc_source', 'patch-rc_source.sql' ], - [ 'addIndex', 'logging', 'log_user_text_type_time', + [ 'ifNoActorTable', 'addIndex', 'logging', 'log_user_text_type_time', 'patch-logging_user_text_type_time_index.sql' ], - [ 'addIndex', 'logging', 'log_user_text_time', 'patch-logging_user_text_time_index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'logging', 'log_user_text_time', + 'patch-logging_user_text_time_index.sql' ], [ 'addField', 'page', 'page_links_updated', 'patch-page_links_updated.sql' ], [ 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ], @@@ -294,14 -287,13 +294,14 @@@ [ 'doNonUniquePlTlIl' ], [ 'addField', 'change_tag', 'ct_id', 'patch-change_tag-ct_id.sql' ], [ 'modifyField', 'recentchanges', 'rc_ip', 'patch-rc_ip_modify.sql' ], - [ 'addIndex', 'archive', 'usertext_timestamp', 'patch-rename-ar_usertext_timestamp.sql' ], + [ 'ifNoActorTable', 'addIndex', 'archive', 'usertext_timestamp', + 'patch-rename-ar_usertext_timestamp.sql' ], // 1.29 [ 'addField', 'externallinks', 'el_index_60', 'patch-externallinks-el_index_60.sql' ], [ 'dropIndex', 'user_groups', 'ug_user_group', 'patch-user_groups-primary-key.sql' ], [ 'addField', 'user_groups', 'ug_expiry', 'patch-user_groups-ug_expiry.sql' ], - [ 'addIndex', 'image', 'img_user_timestamp', 'patch-image-user-index-2.sql' ], + [ 'ifNoActorTable', 'addIndex', 'image', 'img_user_timestamp', 'patch-image-user-index-2.sql' ], // 1.30 [ 'modifyField', 'image', 'img_media_type', 'patch-add-3d.sql' ], @@@ -327,6 -319,20 +327,20 @@@ [ 'renameIndex', 'user_properties', 'user_properties_user_property', 'PRIMARY', false, 'patch-user_properties-fix-pk.sql' ], [ 'addTable', 'comment', 'patch-comment-table.sql' ], + [ 'addTable', 'revision_comment_temp', 'patch-revision_comment_temp-table.sql' ], + // image_comment_temp is no longer needed when upgrading to MW 1.31 or newer, + // as it is dropped later in the update process as part of 'migrateImageCommentTemp'. + // File kept on disk and the updater entry here for historical purposes. + // [ 'addTable', 'image_comment_temp', 'patch-image_comment_temp-table.sql' ], + [ 'addField', 'archive', 'ar_comment_id', 'patch-archive-ar_comment_id.sql' ], + [ 'addField', 'filearchive', 'fa_description_id', 'patch-filearchive-fa_description_id.sql' ], + [ 'modifyField', 'image', 'img_description', 'patch-image-img_description-default..sql' ], + [ 'addField', 'ipblocks', 'ipb_reason_id', 'patch-ipblocks-ipb_reason_id.sql' ], + [ 'addField', 'logging', 'log_comment_id', 'patch-logging-log_comment_id.sql' ], + [ 'addField', 'oldimage', 'oi_description_id', 'patch-oldimage-oi_description_id.sql' ], + [ 'addField', 'protected_titles', 'pt_reason_id', 'patch-protected_titles-pt_reason_id.sql' ], + [ 'addField', 'recentchanges', 'rc_comment_id', 'patch-recentchanges-rc_comment_id.sql' ], + [ 'modifyField', 'revision', 'rev_comment', 'patch-revision-rev_comment-default.sql' ], // This field was added in 1.31, but is put here so it can be used by 'migrateComments' [ 'addField', 'image', 'img_description_id', 'patch-image-img_description_id.sql' ], @@@ -384,13 -390,6 +398,13 @@@ [ 'dropTable', 'tag_summary' ], [ 'dropField', 'protected_titles', 'pt_reason', 'patch-drop-comment-fields.sql' ], [ 'modifyTable', 'job', 'patch-job-params-mediumblob.sql' ], + + // 1.34 + [ 'dropIndex', 'archive', 'ar_usertext_timestamp', + 'patch-drop-archive-ar_usertext_timestamp.sql' ], + [ 'dropIndex', 'archive', 'usertext_timestamp', 'patch-drop-archive-usertext_timestamp.sql' ], + [ 'dropField', 'logging', 'log_user', 'patch-drop-user-fields.sql' ], + [ 'addIndex', 'user_newtalk', 'un_user_ip', 'patch-rename-mysql-user_newtalk-indexes.sql' ], ]; } diff --combined includes/installer/PostgresUpdater.php index b2c7d66ae7,8b3fb37f38..d7b14573c4 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@@ -110,7 -110,7 +110,7 @@@ class PostgresUpdater extends DatabaseU [ 'addPgField', 'image', 'img_sha1', "TEXT NOT NULL DEFAULT ''" ], [ 'addPgField', 'ipblocks', 'ipb_allow_usertalk', 'SMALLINT NOT NULL DEFAULT 0' ], [ 'addPgField', 'ipblocks', 'ipb_anon_only', 'SMALLINT NOT NULL DEFAULT 0' ], - [ 'addPgField', 'ipblocks', 'ipb_by_text', "TEXT NOT NULL DEFAULT ''" ], + [ 'ifNoActorTable', 'addPgField', 'ipblocks', 'ipb_by_text', "TEXT NOT NULL DEFAULT ''" ], [ 'addPgField', 'ipblocks', 'ipb_block_email', 'SMALLINT NOT NULL DEFAULT 0' ], [ 'addPgField', 'ipblocks', 'ipb_create_account', 'SMALLINT NOT NULL DEFAULT 1' ], [ 'addPgField', 'ipblocks', 'ipb_deleted', 'SMALLINT NOT NULL DEFAULT 0' ], @@@ -152,7 -152,7 +152,7 @@@ [ 'addPgField', 'revision', 'rev_content_format', 'TEXT' ], [ 'addPgField', 'site_stats', 'ss_active_users', "INTEGER DEFAULT '-1'" ], [ 'addPgField', 'user_newtalk', 'user_last_timestamp', 'TIMESTAMPTZ' ], - [ 'addPgField', 'logging', 'log_user_text', "TEXT NOT NULL DEFAULT ''" ], + [ 'ifNoActorTable', 'addPgField', 'logging', 'log_user_text', "TEXT NOT NULL DEFAULT ''" ], [ 'addPgField', 'logging', 'log_page', 'INTEGER' ], [ 'addPgField', 'interwiki', 'iw_api', "TEXT NOT NULL DEFAULT ''" ], [ 'addPgField', 'interwiki', 'iw_wikiid', "TEXT NOT NULL DEFAULT ''" ], @@@ -240,7 -240,7 +240,7 @@@ [ 'checkOiDeleted' ], # New indexes - [ 'addPgIndex', 'archive', 'archive_user_text', '(ar_user_text)' ], + [ 'ifNoActorTable', 'addPgIndex', 'archive', 'archive_user_text', '(ar_user_text)' ], [ 'addPgIndex', 'image', 'img_sha1', '(img_sha1)' ], [ 'addPgIndex', 'ipblocks', 'ipb_parent_block_id', '(ipb_parent_block_id)' ], [ 'addPgIndex', 'oldimage', 'oi_sha1', '(oi_sha1)' ], @@@ -253,7 -253,7 +253,7 @@@ [ 'addPgIndex', 'watchlist', 'wl_user', '(wl_user)' ], [ 'addPgIndex', 'watchlist', 'wl_user_notificationtimestamp', '(wl_user, wl_notificationtimestamp)' ], - [ 'addPgIndex', 'logging', 'logging_user_type_time', + [ 'ifNoActorTable', 'addPgIndex', 'logging', 'logging_user_type_time', '(log_user, log_type, log_timestamp)' ], [ 'addPgIndex', 'logging', 'logging_page_id_time', '(log_page,log_timestamp)' ], [ 'addPgIndex', 'iwlinks', 'iwl_prefix_from_title', '(iwl_prefix, iwl_from, iwl_title)' ], @@@ -263,10 -263,9 +263,10 @@@ [ 'addPgIndex', 'job', 'job_cmd_token', '(job_cmd, job_token, job_random)' ], [ 'addPgIndex', 'job', 'job_cmd_token_id', '(job_cmd, job_token, job_id)' ], [ 'addPgIndex', 'filearchive', 'fa_sha1', '(fa_sha1)' ], - [ 'addPgIndex', 'logging', 'logging_user_text_type_time', + [ 'ifNoActorTable', 'addPgIndex', 'logging', 'logging_user_text_type_time', '(log_user_text, log_type, log_timestamp)' ], - [ 'addPgIndex', 'logging', 'logging_user_text_time', '(log_user_text, log_timestamp)' ], + [ 'ifNoActorTable', 'addPgIndex', 'logging', 'logging_user_text_time', + '(log_user_text, log_timestamp)' ], [ 'checkIndex', 'pagelink_unique', [ [ 'pl_from', 'int4_ops', 'btree', 0 ], @@@ -364,36 -363,30 +364,36 @@@ [ 'checkIwlPrefix' ], # All FK columns should be deferred - [ 'changeFkeyDeferrable', 'archive', 'ar_user', 'mwuser(user_id) ON DELETE SET NULL' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'archive', 'ar_user', + 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'categorylinks', 'cl_from', 'page(page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'externallinks', 'el_from', 'page(page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'filearchive', 'fa_deleted_user', 'mwuser(user_id) ON DELETE SET NULL' ], - [ 'changeFkeyDeferrable', 'filearchive', 'fa_user', 'mwuser(user_id) ON DELETE SET NULL' ], - [ 'changeFkeyDeferrable', 'image', 'img_user', 'mwuser(user_id) ON DELETE SET NULL' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'filearchive', 'fa_user', + 'mwuser(user_id) ON DELETE SET NULL' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'image', 'img_user', + 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'imagelinks', 'il_from', 'page(page_id) ON DELETE CASCADE' ], - [ 'changeFkeyDeferrable', 'ipblocks', 'ipb_by', 'mwuser(user_id) ON DELETE CASCADE' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'ipblocks', 'ipb_by', + 'mwuser(user_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'ipblocks', 'ipb_user', 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'ipblocks', 'ipb_parent_block_id', 'ipblocks(ipb_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'langlinks', 'll_from', 'page(page_id) ON DELETE CASCADE' ], - [ 'changeFkeyDeferrable', 'logging', 'log_user', 'mwuser(user_id) ON DELETE SET NULL' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'logging', 'log_user', + 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'oldimage', 'oi_name', 'image(img_name) ON DELETE CASCADE ON UPDATE CASCADE' ], - [ 'changeFkeyDeferrable', 'oldimage', 'oi_user', 'mwuser(user_id) ON DELETE SET NULL' ], + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'oldimage', 'oi_user', + 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'pagelinks', 'pl_from', 'page(page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'page_props', 'pp_page', 'page (page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'page_restrictions', 'pr_page', 'page(page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'protected_titles', 'pt_user', 'mwuser(user_id) ON DELETE SET NULL' ], - [ 'changeFkeyDeferrable', 'recentchanges', 'rc_user', + [ 'ifNoActorTable', 'changeFkeyDeferrable', 'recentchanges', 'rc_user', 'mwuser(user_id) ON DELETE SET NULL' ], [ 'changeFkeyDeferrable', 'redirect', 'rd_from', 'page(page_id) ON DELETE CASCADE' ], [ 'changeFkeyDeferrable', 'revision', 'rev_page', 'page (page_id) ON DELETE CASCADE' ], @@@ -483,6 -476,11 +483,11 @@@ [ 'changeNullableField', 'protected_titles', 'pt_reason', 'NOT NULL', true ], [ 'addPgField', 'protected_titles', 'pt_reason_id', 'INTEGER NOT NULL DEFAULT 0' ], [ 'addTable', 'comment', 'patch-comment-table.sql' ], + [ 'addTable', 'revision_comment_temp', 'patch-revision_comment_temp-table.sql' ], + // image_comment_temp is no longer needed when upgrading to MW 1.31 or newer, + // as it is dropped later in the update process as part of 'migrateImageCommentTemp'. + // File kept on disk and the updater entry here for historical purposes. + // [ 'addTable', 'image_comment_temp', 'patch-image_comment_temp-table.sql' ], // This field was added in 1.31, but is put here so it can be used by 'migrateComments' [ 'addPgField', 'image', 'img_description_id', 'INTEGER NOT NULL DEFAULT 0' ], @@@ -625,34 -623,6 +630,34 @@@ [ 'dropDefault', 'logging', 'log_comment_id' ], [ 'dropPgField', 'protected_titles', 'pt_reason' ], [ 'dropDefault', 'protected_titles', 'pt_reason_id' ], + + // 1.34 + [ 'dropPgIndex', 'archive', 'archive_user_text' ], + [ 'dropPgField', 'archive', 'ar_user' ], + [ 'dropPgField', 'archive', 'ar_user_text' ], + [ 'dropDefault', 'archive', 'ar_actor' ], + [ 'dropPgField', 'ipblocks', 'ipb_by' ], + [ 'dropPgField', 'ipblocks', 'ipb_by_text' ], + [ 'dropDefault', 'ipblocks', 'ipb_by_actor' ], + [ 'dropPgField', 'image', 'img_user' ], + [ 'dropPgField', 'image', 'img_user_text' ], + [ 'dropDefault', 'image', 'img_actor' ], + [ 'dropPgField', 'oldimage', 'oi_user' ], + [ 'dropPgField', 'oldimage', 'oi_user_text' ], + [ 'dropDefault', 'oldimage', 'oi_actor' ], + [ 'dropPgField', 'filearchive', 'fa_user' ], + [ 'dropPgField', 'filearchive', 'fa_user_text' ], + [ 'dropDefault', 'filearchive', 'fa_actor' ], + [ 'dropPgField', 'recentchanges', 'rc_user' ], + [ 'dropPgField', 'recentchanges', 'rc_user_text' ], + [ 'dropDefault', 'recentchanges', 'rc_actor' ], + [ 'dropPgIndex', 'logging', 'logging_user_time' ], + [ 'dropPgIndex', 'logging', 'logging_user_type_time' ], + [ 'dropPgIndex', 'logging', 'logging_user_text_type_time' ], + [ 'dropPgIndex', 'logging', 'logging_user_text_time' ], + [ 'dropPgField', 'logging', 'log_user' ], + [ 'dropPgField', 'logging', 'log_user_text' ], + [ 'dropDefault', 'logging', 'log_actor' ], ]; } diff --combined includes/installer/SqliteUpdater.php index 7c3878ce44,b333c16c4c..4722443f36 --- a/includes/installer/SqliteUpdater.php +++ b/includes/installer/SqliteUpdater.php @@@ -47,9 -47,9 +47,9 @@@ class SqliteUpdater extends DatabaseUpd // 1.16 [ 'addTable', 'user_properties', 'patch-user_properties.sql' ], [ 'addTable', 'log_search', 'patch-log_search.sql' ], - [ 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ], + [ 'ifNoActorTable', 'addField', 'logging', 'log_user_text', 'patch-log_user_text.sql' ], # listed separately from the previous update because 1.16 was released without this update - [ 'doLogUsertextPopulation' ], + [ 'ifNoActorTable', 'doLogUsertextPopulation' ], [ 'doLogSearchPopulation' ], [ 'addTable', 'l10n_cache', 'patch-l10n_cache.sql' ], [ 'dropIndex', 'change_tag', 'ct_rc_id', 'patch-change_tag-indexes.sql' ], @@@ -119,10 -119,9 +119,10 @@@ // 1.23 [ 'addField', 'recentchanges', 'rc_source', 'patch-rc_source.sql' ], - [ 'addIndex', 'logging', 'log_user_text_type_time', + [ 'ifNoActorTable', 'addIndex', 'logging', 'log_user_text_type_time', 'patch-logging_user_text_type_time_index.sql' ], - [ 'addIndex', 'logging', 'log_user_text_time', 'patch-logging_user_text_time_index.sql' ], + [ 'ifNoActorTable', 'addIndex', 'logging', 'log_user_text_time', + 'patch-logging_user_text_time_index.sql' ], [ 'addField', 'page', 'page_links_updated', 'patch-page_links_updated.sql' ], [ 'addField', 'user', 'user_password_expires', 'patch-user_password_expire.sql' ], @@@ -160,7 -159,7 +160,7 @@@ // 1.29 [ 'addField', 'externallinks', 'el_index_60', 'patch-externallinks-el_index_60.sql' ], [ 'addField', 'user_groups', 'ug_expiry', 'patch-user_groups-ug_expiry.sql' ], - [ 'addIndex', 'image', 'img_user_timestamp', 'patch-image-user-index-2.sql' ], + [ 'ifNoActorTable', 'addIndex', 'image', 'img_user_timestamp', 'patch-image-user-index-2.sql' ], // 1.30 [ 'modifyField', 'image', 'img_media_type', 'patch-add-3d.sql' ], @@@ -186,6 -185,19 +186,19 @@@ [ 'renameIndex', 'user_properties', 'user_properties_user_property', 'PRIMARY', false, 'patch-user_properties-fix-pk.sql' ], [ 'addTable', 'comment', 'patch-comment-table.sql' ], + [ 'addTable', 'revision_comment_temp', 'patch-revision_comment_temp-table.sql' ], + // image_comment_temp is no longer needed when upgrading to MW 1.31 or newer, + // as it is dropped later in the update process as part of 'migrateImageCommentTemp'. + // File kept on disk and the updater entry here for historical purposes. + // [ 'addTable', 'image_comment_temp', 'patch-image_comment_temp-table.sql' ], + [ 'addField', 'archive', 'ar_comment_id', 'patch-archive-ar_comment_id.sql' ], + [ 'modifyField', 'image', 'img_description', 'patch-image-img_description-default..sql' ], + [ 'addField', 'ipblocks', 'ipb_reason_id', 'patch-ipblocks-ipb_reason_id.sql' ], + [ 'addField', 'logging', 'log_comment_id', 'patch-logging-log_comment_id.sql' ], + [ 'addField', 'oldimage', 'oi_description_id', 'patch-oldimage-oi_description_id.sql' ], + [ 'addField', 'protected_titles', 'pt_reason_id', 'patch-protected_titles-pt_reason_id.sql' ], + [ 'addField', 'recentchanges', 'rc_comment_id', 'patch-recentchanges-rc_comment_id.sql' ], + [ 'modifyField', 'revision', 'rev_comment', 'patch-revision-rev_comment-default.sql' ], // This field was added in 1.31, but is put here so it can be used by 'migrateComments' [ 'addField', 'image', 'img_description_id', 'patch-image-img_description_id.sql' ], @@@ -250,15 -262,6 +263,15 @@@ [ 'dropField', 'recentchanges', 'rc_comment', 'patch-recentchanges-drop-rc_comment.sql' ], [ 'dropField', 'logging', 'log_comment', 'patch-logging-drop-log_comment.sql' ], [ 'dropField', 'protected_titles', 'pt_reason', 'patch-protected_titles-drop-pt_reason.sql' ], + + // 1.34 + [ 'dropField', 'archive', 'ar_user', 'patch-archive-drop-ar_user.sql' ], + [ 'dropField', 'ipblocks', 'ipb_by', 'patch-ipblocks-drop-ipb_by.sql' ], + [ 'dropField', 'image', 'img_user', 'patch-image-drop-img_user.sql' ], + [ 'dropField', 'oldimage', 'oi_user', 'patch-oldimage-drop-oi_user.sql' ], + [ 'dropField', 'filearchive', 'fa_user', 'patch-filearchive-drop-fa_user.sql' ], + [ 'dropField', 'recentchanges', 'rc_user', 'patch-recentchanges-drop-rc_user.sql' ], + [ 'dropField', 'logging', 'log_user', 'patch-logging-drop-log_user.sql' ], ]; }