From fe7ca9b9fdb18e0d21439b012cd033d99494f78a Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 12 Sep 2010 07:58:00 +0000 Subject: [PATCH] Add `watchlist`.`wl_notificationtimestamp` through addField() instead of duplicating the code in do_watchlist_update() --- includes/installer/MysqlUpdater.php | 1 + maintenance/updaters.inc | 10 ---------- 2 files changed, 1 insertion(+), 10 deletions(-) diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php index a54b202bf9..28501e46c3 100644 --- a/includes/installer/MysqlUpdater.php +++ b/includes/installer/MysqlUpdater.php @@ -39,6 +39,7 @@ class MysqlUpdater extends DatabaseUpdater { array( 'addField', 'recentchanges', 'rc_patrolled', 'patch-rc-patrol.sql' ), array( 'addTable', 'logging', 'patch-logging.sql' ), array( 'addField', 'user', 'user_token', 'patch-user_token.sql' ), + array( 'addField', 'watchlist', 'wl_notificationtimestamp', 'patch-email-notification.sql' ), array( 'do_watchlist_update' ), array( 'dropField', 'user', 'user_emailauthenticationtimestamp', 'patch-email-authentication.sql' ), diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index bb14f4a5a5..a217adbbea 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -56,20 +56,11 @@ function do_image_name_unique_update() { function do_watchlist_update() { $dbw = wfGetDB( DB_MASTER ); - if ( $dbw->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) { - wfOut( "...the watchlist table is already set up for email notification.\n" ); - } else { - wfOut( "Adding wl_notificationtimestamp field for email notification management." ); - /* ALTER TABLE watchlist ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0'); */ - $dbw->sourceFile( archive( 'patch-email-notification.sql' ) ); - wfOut( "ok\n" ); - } # Check if we need to add talk page rows to the watchlist $talk = $dbw->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', __METHOD__ ); $nontalk = $dbw->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', __METHOD__ ); if ( $talk != $nontalk ) { wfOut( "Adding missing watchlist talk page rows... " ); - flush(); $dbw->insertSelect( 'watchlist', 'watchlist', array( @@ -278,7 +269,6 @@ function do_pagelinks_update() { wfOut( "Converting links and brokenlinks tables to pagelinks... " ); $dbw->sourceFile( archive( 'patch-pagelinks.sql' ) ); wfOut( "ok\n" ); - flush(); global $wgCanonicalNamespaceNames; foreach ( $wgCanonicalNamespaceNames as $ns => $name ) { -- 2.20.1