Add `watchlist`.`wl_notificationtimestamp` through addField() instead of duplicating...

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index a54b202..28501e4 100644 (file)
--- 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 bb14f4a..a217adb 100644 (file)
--- 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 ) {