* (bug 5195) rebuildrecentchanges.php works again; Database::insertSelect now has...
[lhc/web/wiklou.git] / maintenance / updaters.inc
index e17cb5c..6f33841 100644 (file)
@@ -3,7 +3,7 @@
  * @package MediaWiki
  * @subpackage Maintenance
  */
+
  /** */
 
 require_once 'convertLinks.inc';
@@ -23,6 +23,11 @@ $wgNewTables = array(
        array( 'categorylinks', 'patch-categorylinks.sql' ),
        array( 'logging',       'patch-logging.sql' ),
        array( 'validate',      'patch-validate.sql' ),
+       array( 'user_newtalk',  'patch-usernewtalk2.sql' ),
+       array( 'transcache',    'patch-transcache.sql' ),
+       array( 'trackbacks',    'patch-trackbacks.sql' ),
+       array( 'externallinks', 'patch-externallinks.sql' ),
+       array( 'job',           'patch-job.sql' ),
 );
 
 $wgNewFields = array(
@@ -36,6 +41,7 @@ $wgNewFields = array(
        array( 'user',          'user_real_name',   'patch-user-realname.sql' ),
        array( 'user',          'user_token',       'patch-user_token.sql' ),
        array( 'user',          'user_email_token', 'patch-user_email_token.sql' ),
+       array( 'user',          'user_registration','patch-user_registration.sql' ),
        array( 'logging',       'log_params',       'patch-log_params.sql' ),
        array( 'archive',       'ar_rev_id',        'patch-archive-rev_id.sql' ),
        array( 'archive',       'ar_text_id',       'patch-archive-text_id.sql' ),
@@ -45,6 +51,10 @@ $wgNewFields = array(
        array( 'image',         'img_metadata',     'patch-img_metadata.sql' ),
        array( 'image',         'img_media_type',   'patch-img_media_type.sql' ),
        array( 'validate',      'val_ip',           'patch-val_ip.sql' ),
+       array( 'site_stats',    'ss_total_pages',   'patch-ss_total_articles.sql' ),
+       array( 'interwiki',     'iw_trans',         'patch-interwiki-trans.sql' ),
+       array( 'ipblocks',      'ipb_range_start',  'patch-ipb_range_start.sql' ),
+       array( 'site_stats',    'ss_images',        'patch-ss_images.sql' ),
 );
 
 function rename_table( $from, $to, $patch ) {
@@ -54,7 +64,7 @@ function rename_table( $from, $to, $patch ) {
                        echo "...can't move table $from to $to, $to already exists.\n";
                } else {
                        echo "Moving table $from to $to...";
-                       dbsource( "maintenance/archives/$patch", $wgDatabase );
+                       dbsource( archive($patch), $wgDatabase );
                        echo "ok\n";
                }
        } else {
@@ -70,7 +80,7 @@ function add_table( $name, $patch ) {
                echo "...$name table already exists.\n";
        } else {
                echo "Creating $name table...";
-               dbsource( "maintenance/archives/$patch", $wgDatabase );
+               dbsource( archive($patch), $wgDatabase );
                echo "ok\n";
        }
 }
@@ -83,7 +93,7 @@ function add_field( $table, $field, $patch ) {
                echo "...have $field field in $table table.\n";
        } else {
                echo "Adding $field field to table $table...";
-               dbsource( "maintenance/archives/$patch" , $wgDatabase );
+               dbsource( archive($patch) , $wgDatabase );
                echo "ok\n";
        }
 }
@@ -97,7 +107,7 @@ function do_revision_updates() {
 
 function update_passwords() {
        wfDebugDieBacktrace( "This function needs to be updated or removed.\n" );
-       
+
        global $wgDatabase;
        $fname = "Update script: update_passwords()";
        print "\nIt appears that you need to update the user passwords in your\n" .
@@ -131,7 +141,7 @@ function do_interwiki_update() {
                return true;
        }
        echo "Creating interwiki table: ";
-       dbsource( "maintenance/archives/patch-interwiki.sql" );
+       dbsource( archive("patch-interwiki.sql") );
        echo "ok\n";
        echo "Adding default interwiki definitions: ";
        dbsource( "maintenance/interwiki.sql" );
@@ -144,7 +154,7 @@ function do_index_update() {
        $meta = $wgDatabase->fieldInfo( "recentchanges", "rc_timestamp" );
        if( $meta->multiple_key == 0 ) {
                echo "Updating indexes to 20031107: ";
-               dbsource( "maintenance/archives/patch-indexes.sql" );
+               dbsource( archive("patch-indexes.sql") );
                echo "ok\n";
                return true;
        }
@@ -152,74 +162,110 @@ function do_index_update() {
        return false;
 }
 
+function do_image_index_update() {
+       global $wgDatabase;
+
+       $meta = $wgDatabase->fieldInfo( "image", "img_major_mime" );
+       if( $meta->multiple_key == 0 ) {
+               echo "Updating indexes to 20050912: ";
+               dbsource( archive("patch-mimesearch-indexes.sql") );
+               echo "ok\n";
+               return true;
+       }
+       echo "...indexes seem up to 20050912 standards\n";
+       return false;
+}
+
 function do_image_name_unique_update() {
        global $wgDatabase;
        if( $wgDatabase->indexExists( 'image', 'PRIMARY' ) ) {
                echo "...image primary key already set.\n";
        } else {
                echo "Making img_name the primary key... ";
-               dbsource( "maintenance/archives/patch-image_name_primary.sql", $wgDatabase );
+               dbsource( archive("patch-image_name_primary.sql"), $wgDatabase );
                echo "ok\n";
        }
 }
 
+function do_logging_timestamp_index() {
+       global $wgDatabase;
+       if( $wgDatabase->indexExists( 'logging', 'times' ) ) {
+               echo "...timestamp key on logging already exists.\n";
+       } else {
+               echo "Adding timestamp key on logging table... ";
+               dbsource( archive("patch-logging-times-index.sql"), $wgDatabase );
+               echo "ok\n";
+       }
+}
+
+
 function do_watchlist_update() {
        global $wgDatabase;
+       $fname = 'do_watchlist_update';
        if( $wgDatabase->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
-               echo "ENOTIF: The watchlist table is already set up for email notification.\n";
+               echo "The watchlist table is already set up for email notification.\n";
        } else {
-               echo "ENOTIF: Adding wl_notificationtimestamp field for email notification management.";
+               echo "Adding wl_notificationtimestamp field for email notification management.";
                /* ALTER TABLE watchlist ADD (wl_notificationtimestamp varchar(14) binary NOT NULL default '0'); */
                dbsource( "maintenance/archives/patch-email-notification.sql", $wgDatabase );
                echo "ok\n";
        }
+       # Check if we need to add talk page rows to the watchlist
+       $talk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'wl_namespace & 1', $fname );
+       $nontalk = $wgDatabase->selectField( 'watchlist', 'count(*)', 'NOT (wl_namespace & 1)', $fname );
+       if ( $talk != $nontalk ) {
+               echo "Adding missing watchlist talk page rows... ";
+               flush();
+
+               $wgDatabase->insertSelect( 'watchlist', 'watchlist', 
+                       array(
+                               'wl_user' => 'wl_user',
+                               'wl_namespace' => 'wl_namespace | 1',
+                               'wl_title' => 'wl_title',
+                               'wl_notificationtimestamp' => 'wl_notificationtimestamp'
+                       ), array( 'NOT (wl_namespace & 1)' ), $fname, 'IGNORE' );
+               echo "ok\n";
+       } else {
+               echo "...watchlist talk page rows already present\n";
+       }
 }
 
 function do_copy_newtalk_to_watchlist() {
        global $wgDatabase;
        global $wgCommandLineMode;      # this needs to be saved while getID() and getName() are called
 
-       if ( $wgDatabase->tableExists( 'user_newtalk' ) ) {
-               $res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
-                       $wgDatabase->tableName( 'user_newtalk' ) );
-               $num_newtalks=$wgDatabase->numRows($res);
-               echo "ENOTIF: Now converting ".$num_newtalks." user_newtalk entries to watchlist table entries ... \n";
-
-               $user = new User();
-               for ( $i = 1; $i <= $num_newtalks; $i++ ) {
-                       $wluser = $wgDatabase->fetchObject( $res );
-                       echo 'ENOTIF: <= user_newtalk: user_id='.$wluser->user_id.' user_ip='.$wluser->user_ip."\n";
-                       if ($wluser->user_id == 0) { # anonymous users ... have IP numbers as "names"
-                               if ($user->isIP($wluser->user_ip)) { # do only if it really looks like an IP number (double checked)
-                                       $wgDatabase->replace( 'watchlist',
-                                               array(array('wl_user','wl_namespace', 'wl_title', 'wl_notificationtimestamp' )),
-                                                 array('wl_user'                       => 0,
-                                                       'wl_namespace'                  => NS_USER_TALK,
-                                                       'wl_title'                      => $wluser->user_ip,
-                                                       'wl_notificationtimestamp'      => '19700101000000'
-                                                       ), 'updaters.inc::do_watchlist_update2'
-                                               );
-                                       echo 'ENOTIF: ====> watchlist: user_id=0 '.$wluser->user_ip."\n";
-                               }
-                       } else { # normal users ... have user_ids
-                               $user->setID($wluser->user_id);
+       $res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
+               $wgDatabase->tableName( 'user_newtalk' ) );
+       $num_newtalks=$wgDatabase->numRows($res);
+       echo "Now converting ".$num_newtalks." user_newtalk entries to watchlist table entries ... \n";
+
+       $user = new User();
+       for ( $i = 1; $i <= $num_newtalks; $i++ ) {
+               $wluser = $wgDatabase->fetchObject( $res );
+               if ($wluser->user_id == 0) { # anonymous users ... have IP numbers as "names"
+                       if ($user->isIP($wluser->user_ip)) { # do only if it really looks like an IP number (double checked)
                                $wgDatabase->replace( 'watchlist',
                                        array(array('wl_user','wl_namespace', 'wl_title', 'wl_notificationtimestamp' )),
-                                         array('wl_user'                       => $user->getID(),
+                                         array('wl_user'                       => 0,
                                                'wl_namespace'                  => NS_USER_TALK,
-                                               'wl_title'                      => $user->getName(),
+                                               'wl_title'                      => $wluser->user_ip,
                                                'wl_notificationtimestamp'      => '19700101000000'
-                                               ), 'updaters.inc::do_watchlist_update3'
+                                               ), 'updaters.inc::do_watchlist_update2'
                                        );
-                               echo 'ENOTIF: ====> watchlist: user_id='.$user->getID().' '.$user->getName()."\n";
                        }
+               } else { # normal users ... have user_ids
+                       $user->setID($wluser->user_id);
+                       $wgDatabase->replace( 'watchlist',
+                               array(array('wl_user','wl_namespace', 'wl_title', 'wl_notificationtimestamp' )),
+                                 array('wl_user'                       => $user->getID(),
+                                       'wl_namespace'                  => NS_USER_TALK,
+                                       'wl_title'                      => $user->getName(),
+                                       'wl_notificationtimestamp'      => '19700101000000'
+                                       ), 'updaters.inc::do_watchlist_update3'
+                               );
                }
-               echo "ENOTIF: The watchlist table has got the former user_newtalk entries.\n";
-               dbsource( "maintenance/archives/patch-drop-user_newtalk.sql", $wgDatabase );
-               echo "ENOTIF: Deleting the user_newtalk table as its entries are now in the watchlist table.\n";
-       } else {
-               echo "ENOTIF: No user_newtalk table found. Nothing to convert to watchlist table entries.\n";
        }
+       echo "Done.\n";
 }
 
 
@@ -239,12 +285,14 @@ function do_user_update() {
  * which causes a collation mismatch error on joins in MySQL 4.1.
  */
 function do_logging_encoding() {
-       global $wgDatabase;
+       global $wgDatabase, $wgDBtype;
+       if ($wgDBtype != 'mysql')
+               return;
        $logging = $wgDatabase->tableName( 'logging' );
        $res = $wgDatabase->query( "SELECT log_title FROM $logging LIMIT 0" );
        $flags = explode( ' ', mysql_field_flags( $res, 0 ) );
        $wgDatabase->freeResult( $res );
-       
+
        if( in_array( 'binary', $flags ) ) {
                echo "Logging table has correct title encoding.\n";
        } else {
@@ -263,7 +311,7 @@ function do_schema_restructuring() {
                echo "...converting from cur/old to page/revision/text DB structure.\n"; flush();
                echo wfTimestamp();
                echo "......checking for duplicate entries.\n"; flush();
-               
+
                extract( $wgDatabase->tableNames( 'cur', 'old', 'page', 'revision', 'text' ) );
 
                $rows = $wgDatabase->query( "SELECT cur_title, cur_namespace, COUNT(cur_namespace) AS c
@@ -281,7 +329,7 @@ function do_schema_restructuring() {
                                echo ( sprintf( "      %-60s %3s %5s\n", $row->cur_title, $row->cur_namespace, $row->c ) );
                        }
                        $sql = "SELECT cur_title, cur_namespace, cur_id, cur_timestamp FROM $cur WHERE ";
-                       $firstCond = true; 
+                       $firstCond = true;
                        foreach ( $duplicate as $ns => $titles ) {
                                if ( $firstCond ) {
                                        $firstCond = false;
@@ -321,7 +369,7 @@ function do_schema_restructuring() {
                        echo wfTimestamp();
                        echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
                }
-               
+
 
                echo wfTimestamp();
                echo "......Creating tables.\n";
@@ -342,7 +390,7 @@ function do_schema_restructuring() {
                        UNIQUE INDEX name_title (page_namespace,page_title),
                        INDEX (page_random),
                        INDEX (page_len)
-                       ) TYPE=InnoDB", $fname );
+                       ) ENGINE=InnoDB", $fname );
                $wgDatabase->query("CREATE TABLE $revision (
                        rev_id int(8) unsigned NOT NULL auto_increment,
                        rev_page int(8) unsigned NOT NULL,
@@ -352,20 +400,20 @@ function do_schema_restructuring() {
                        rev_timestamp char(14) binary NOT NULL default '',
                        rev_minor_edit tinyint(1) unsigned NOT NULL default '0',
                        rev_deleted tinyint(1) unsigned NOT NULL default '0',
-  
+
                        PRIMARY KEY rev_page_id (rev_page, rev_id),
                        UNIQUE INDEX rev_id (rev_id),
                        INDEX rev_timestamp (rev_timestamp),
                        INDEX page_timestamp (rev_page,rev_timestamp),
                        INDEX user_timestamp (rev_user,rev_timestamp),
                        INDEX usertext_timestamp (rev_user_text,rev_timestamp)
-                       ) TYPE=InnoDB", $fname );
+                       ) ENGINE=InnoDB", $fname );
 
                echo wfTimestamp();
                echo "......Locking tables.\n";
                $wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
 
-               $maxold = $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname );
+               $maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
                echo wfTimestamp();
                echo "......maxold is {$maxold}\n";
 
@@ -413,7 +461,7 @@ function do_schema_restructuring() {
                echo wfTimestamp();
                echo "......Renaming old.\n";
                $wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
-               
+
                echo wfTimestamp();
                echo "...done.\n";
        }
@@ -458,22 +506,24 @@ function do_namespace_size() {
 }
 
 function do_namespace_size_on( $table, $prefix ) {
-       global $wgDatabase;
+       global $wgDatabase, $wgDBtype;
+       if ($wgDBtype != 'mysql')
+               return;
        $field = $prefix . '_namespace';
-       
+
        $tablename = $wgDatabase->tableName( $table );
        $result = $wgDatabase->query( "SHOW COLUMNS FROM $tablename LIKE '$field'" );
        $info = $wgDatabase->fetchObject( $result );
        $wgDatabase->freeResult( $result );
-       
+
        if( substr( $info->Type, 0, 3 ) == 'int' ) {
                echo "...$field is already a full int ($info->Type).\n";
        } else {
                echo "Promoting $field from $info->Type to int... ";
-               
+
                $sql = "ALTER TABLE $tablename MODIFY $field int NOT NULL";
                $wgDatabase->query( $sql );
-               
+
                echo "ok\n";
        }
 }
@@ -487,7 +537,7 @@ function do_pagelinks_update() {
                dbsource( "maintenance/archives/patch-pagelinks.sql", $wgDatabase );
                echo "ok\n";
                flush();
-               
+
                global $wgCanonicalNamespaceNames;
                foreach( $wgCanonicalNamespaceNames as $ns => $name ) {
                        if( $ns != 0 ) {
@@ -499,28 +549,28 @@ function do_pagelinks_update() {
 
 function do_pagelinks_namespace( $namespace ) {
        global $wgDatabase, $wgContLang;
-       
-       $ns = IntVal( $namespace );
+
+       $ns = intval( $namespace );
        echo "Cleaning up broken links for namespace $ns... ";
-       
+
        $pagelinks = $wgDatabase->tableName( 'pagelinks' );
        $name = $wgContLang->getNsText( $ns );
        $prefix = $wgDatabase->strencode( $name );
        $likeprefix = str_replace( '_', '\\_', $prefix);
-       
+
        $sql = "UPDATE $pagelinks
                   SET pl_namespace=$ns,
                       pl_title=TRIM(LEADING '$prefix:' FROM pl_title)
                 WHERE pl_namespace=0
                   AND pl_title LIKE '$likeprefix:%'";
-       
+
        $wgDatabase->query( $sql, 'do_pagelinks_namespace' );
        echo "ok\n";
 }
 
 function do_drop_img_type() {
        global $wgDatabase;
-       
+
        if( $wgDatabase->fieldExists( 'image', 'img_type' ) ) {
                echo "Dropping unused img_type field in image table... ";
                dbsource( "maintenance/archives/patch-drop_img_type.sql", $wgDatabase );
@@ -557,16 +607,16 @@ function do_user_unique_update() {
 function do_user_groups_update() {
        $fname = 'do_user_groups_update';
        global $wgDatabase;
-       
+
        if( $wgDatabase->tableExists( 'user_groups' ) ) {
                echo "...user_groups table already exists.\n";
                return do_user_groups_reformat();
        }
-       
+
        echo "Adding user_groups table... ";
        dbsource( 'maintenance/archives/patch-user_groups.sql', $wgDatabase );
        echo "ok\n";
-       
+
        if( !$wgDatabase->tableExists( 'user_rights' ) ) {
                if( $wgDatabase->fieldExists( 'user', 'user_rights' ) ) {
                        echo "Upgrading from a 1.3 or older database? Breaking out user_rights for conversion...";
@@ -579,18 +629,18 @@ function do_user_groups_update() {
                        return;
                }
        }
-       
+
        echo "Converting user_rights table to user_groups... ";
        $result = $wgDatabase->select( 'user_rights',
                array( 'ur_user', 'ur_rights' ),
                array( "ur_rights != ''" ),
                $fname );
-       
+
        while( $row = $wgDatabase->fetchObject( $result ) ) {
                $groups = array_unique(
                        array_map( 'trim',
                                explode( ',', $row->ur_rights ) ) );
-               
+
                foreach( $groups as $group ) {
                        $wgDatabase->insert( 'user_groups',
                                array(
@@ -607,18 +657,18 @@ function do_user_groups_reformat() {
        # Check for bogus formats from previous 1.5 alpha code.
        global $wgDatabase;
        $info = $wgDatabase->fieldInfo( 'user_groups', 'ug_group' );
-       
+
        if( $info->type == 'int' ) {
                $oldug = $wgDatabase->tableName( 'user_groups' );
                $newug = $wgDatabase->tableName( 'user_groups_bogus' );
                echo "user_groups is in bogus intermediate format. Renaming to $newug... ";
                $wgDatabase->query( "ALTER TABLE $oldug RENAME TO $newug" );
                echo "ok\n";
-               
+
                echo "Re-adding fresh user_groups table... ";
                dbsource( 'maintenance/archives/patch-user_groups.sql', $wgDatabase );
                echo "ok\n";
-               
+
                echo "***\n";
                echo "*** WARNING: You will need to manually fix up user permissions in the user_groups\n";
                echo "*** table. Old 1.5 alpha versions did some pretty funky stuff...\n";
@@ -626,12 +676,95 @@ function do_user_groups_reformat() {
        } else {
                echo "...user_groups is in current format.\n";
        }
-       
+
 }
 
-function do_all_updates() {
-       global $wgNewTables, $wgNewFields, $wgRenamedTables;
-       
+function do_watchlist_null() {
+       # Make sure wl_notificationtimestamp can be NULL,
+       # and update old broken items.
+       global $wgDatabase;
+       $info = $wgDatabase->fieldInfo( 'watchlist', 'wl_notificationtimestamp' );
+
+       if( $info->not_null ) {
+               echo "Making wl_notificationtimestamp nullable... ";
+               dbsource( 'maintenance/archives/patch-watchlist-null.sql', $wgDatabase );
+               echo "ok\n";
+       } else {
+               echo "...wl_notificationtimestamp is already nullable.\n";
+       }
+
+}
+
+/**
+ * @bug 3946
+ */
+function do_page_random_update() {
+       global $wgDatabase;
+
+       echo "Setting page_random to a random value on rows where it equals 0...";
+
+       $page = $wgDatabase->tableName( 'page' );
+       $wgDatabase->query( "UPDATE $page SET page_random = RAND() WHERE page_random = 0", 'do_page_random_update' );
+       $rows = $wgDatabase->affectedRows();
+
+       echo "changed $rows rows\n";
+}
+
+function do_templatelinks_update() {
+       global $wgDatabase, $wgLoadBalancer;
+       $fname = 'do_templatelinks_update';
+
+       if ( $wgDatabase->tableExists( 'templatelinks' ) ) {
+               echo "...templatelinks table already exists\n";
+               return;
+       }
+       echo "Creating templatelinks table...\n";
+       dbsource( archive('patch-templatelinks.sql'), $wgDatabase );
+       echo "Populating...\n";
+       if ( isset( $wgLoadBalancer ) && $wgLoadBalancer->getServerCount() > 1 ) {
+               // Slow, replication-friendly update
+               $res = $wgDatabase->select( 'pagelinks', array( 'pl_from', 'pl_namespace', 'pl_title' ),
+                       array( 'pl_namespace' => NS_TEMPLATE ), $fname );
+               $count = 0;
+               while ( $row = $wgDatabase->fetchObject( $res ) ) {
+                       $count = ($count + 1) % 100;
+                       if ( $count == 0 ) {
+                               if ( function_exists( 'wfWaitForSlaves' ) ) {
+                                       wfWaitForSlaves( 10 );
+                               } else {
+                                       sleep( 1 );
+                               }
+                       }
+                       $wgDatabase->insert( 'templatelinks',
+                               array(
+                                       'tl_from' => $row->pl_from,
+                                       'tl_namespace' => $row->pl_namespace,
+                                       'tl_title' => $row->pl_title,
+                               ), $fname
+                       );
+
+               }
+               $wgDatabase->freeResult( $res );
+       } else {
+               // Fast update
+               $wgDatabase->insertSelect( 'templatelinks', 'pagelinks',
+                       array(
+                               'tl_from' => 'pl_from',
+                               'tl_namespace' => 'pl_namespace',
+                               'tl_title' => 'pl_title'
+                       ), array(
+                               'pl_namespace' => 10
+                       ), $fname
+               );
+       }
+       echo "Done. Please run maintenance/refreshLinks.php for a more thorough templatelinks update.\n";
+}
+
+function do_all_updates( $doShared = false ) {
+       global $wgNewTables, $wgNewFields, $wgRenamedTables, $wgSharedDB, $wgDatabase;
+
+       $doUser = !$wgSharedDB || $doShared;
+
        # Rename tables
        foreach ( $wgRenamedTables as $tableRecord ) {
                rename_table( $tableRecord[0], $tableRecord[1], $tableRecord[2] );
@@ -645,33 +778,57 @@ function do_all_updates() {
 
        # Add missing fields
        foreach ( $wgNewFields as $fieldRecord ) {
-               add_field( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+               if ( $fieldRecord[0] != 'user' || $doUser ) {
+                       add_field( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+               }
                flush();
        }
-       
+
        # Do schema updates which require special handling
        do_interwiki_update(); flush();
        do_index_update(); flush();
        do_old_links_update(); flush();
        do_image_name_unique_update(); flush();
        do_watchlist_update(); flush();
-       do_user_update(); flush();
-       do_copy_newtalk_to_watchlist(); flush();
+       if ( $doUser ) {
+               do_user_update(); flush();
+       }
+###### do_copy_newtalk_to_watchlist(); flush();
        do_logging_encoding(); flush();
-       
+
        do_schema_restructuring(); flush();
        do_inverse_timestamp(); flush();
        do_text_id(); flush();
        do_namespace_size(); flush();
-       
+
        do_pagelinks_update(); flush();
-       
+       do_templatelinks_update(); flush(); // after pagelinks
+
        do_drop_img_type(); flush();
-       
-       do_user_unique_update(); flush();
+
+       if ( $doUser ) {
+               do_user_unique_update(); flush();
+       }
        do_user_groups_update(); flush();
-       
+
+       do_watchlist_null(); flush();
+
+       //do_image_index_update(); flush();
+
+       do_logging_timestamp_index(); flush();
+
+       do_page_random_update(); flush();
+
        initialiseMessages(); flush();
 }
 
+function archive($name) {
+       global $wgDBtype, $IP;
+       switch ($wgDBtype) {
+       case "oracle":
+               return "$IP/maintenance/oracle/archives/$name";
+       default:
+               return "$IP/maintenance/archives/$name";
+       }
+}
 ?>