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

[lhc/web/wiklou.git] / includes / installer / MysqlUpdater.php

diff --git a/includes/installer/MysqlUpdater.php b/includes/installer/MysqlUpdater.php
index efb4f5c..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' ),
 
@@ -162,8 +163,8 @@ class MysqlUpdater extends DatabaseUpdater {
                        array( 'addIndex', 'iwlinks', 'iwl_prefix_title_from',  'patch-rename-iwl_prefix.sql' ),
                        array( 'addField', 'updatelog', 'ul_value',              'patch-ul_value.sql' ),
                        array( 'addField', 'interwiki',     'iw_api',           'patch-iw_api_and_wikiid.sql' ),
-                       array( 'drop_index_if_exists', 'iwlinks', 'iwl_prefix',  'patch-kill-iwl_prefix.sql' ),
-                       array( 'drop_index_if_exists', 'iwlinks', 'iwl_prefix_from_title', 'patch-kill-iwl_pft.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( 'do_cl_fields_update' ),
                        array( 'do_collation_update' ),
@@ -185,17 +186,14 @@ class MysqlUpdater extends DatabaseUpdater {
                        $field = $prefix . '_namespace';
 
                        $tablename = $this->db->tableName( $table );
-                       $result = $this->db->query( "SHOW COLUMNS FROM $tablename LIKE '$field'" );
+                       $result = $this->db->query( "SHOW COLUMNS FROM $tablename LIKE '$field'", __METHOD__ );
                        $info = $this->db->fetchObject( $result );
 
                        if ( substr( $info->Type, 0, 3 ) == 'int' ) {
                                wfOut( "...$field is already a full int ($info->Type).\n" );
                        } else {
                                wfOut( "Promoting $field from $info->Type to int... " );
-
-                               $sql = "ALTER TABLE $tablename MODIFY $field int NOT NULL";
-                               $this->db->query( $sql );
-
+                               $this->db->query( "ALTER TABLE $tablename MODIFY $field int NOT NULL", __METHOD__ );
                                wfOut( "ok\n" );
                        }
                }