dumpBackup should instantiate correct database class for db type
[lhc/web/wiklou.git] / maintenance / updaters.inc
index e2255c7..902a38c 100644 (file)
@@ -1,17 +1,22 @@
 <?php
 /**
- * @package MediaWiki
- * @subpackage Maintenance
+ * @addtogroup Maintenance
  */
+
  /** */
 
+if ( !defined( 'MEDIAWIKI' ) ) {
+       echo "This file is not a valid entry point\n";
+       exit( 1 );
+}
+
 require_once 'convertLinks.inc';
-require_once 'InitialiseMessages.inc';
+require_once 'userDupes.inc';
+require_once 'deleteDefaultMessages.php';
 
 $wgRenamedTables = array(
 #           from             to                  patch file
-       array( 'group',         'groups',           'patch-rename-group.sql' ),
+#      array( 'group',         'groups',           'patch-rename-group.sql' ),
 );
 
 $wgNewTables = array(
@@ -21,9 +26,15 @@ $wgNewTables = array(
        array( 'objectcache',   'patch-objectcache.sql' ),
        array( 'categorylinks', 'patch-categorylinks.sql' ),
        array( 'logging',       'patch-logging.sql' ),
-       array( 'user_rights',   'patch-user_rights.sql' ),
-       array( 'groups',        'patch-userlevels.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' ),
+       array( 'langlinks',     'patch-langlinks.sql' ),
+       array( 'querycache_info', 'patch-querycacheinfo.sql' ),
+       array( 'filearchive',   'patch-filearchive.sql' ),
+       array( 'querycachetwo', 'patch-querycachetwo.sql' ),
 );
 
 $wgNewFields = array(
@@ -34,11 +45,11 @@ $wgNewFields = array(
        array( 'recentchanges', 'rc_ip',            'patch-rc_ip.sql' ),
        array( 'recentchanges', 'rc_id',            'patch-rc_id.sql' ),
        array( 'recentchanges', 'rc_patrolled',     'patch-rc-patrol.sql' ),
+       array( 'recentchanges', 'rc_old_len',       'patch-rc_len.sql' ),
        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_rights',   'ur_user',          'patch-rename-user_groups-and_rights.sql' ),
-       array( 'groups',        'gr_rights',        'patch-userlevels-rights.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' ),
@@ -47,7 +58,17 @@ $wgNewFields = array(
        array( 'image',         'img_width',        'patch-img_width.sql' ),
        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' ),
+       array( 'ipblocks',      'ipb_anon_only',    'patch-ipb_anon_only.sql' ),
+       array( 'ipblocks',      'ipb_enable_autoblock', 'patch-ipb_optional_autoblock.sql' ),
+       array( 'user',          'user_newpass_time','patch-user_newpass_time.sql' ),
+       array( 'user',          'user_editcount',   'patch-user_editcount.sql' ),
+       array( 'logging',       'log_id',               'patch-log_id.sql' ),
+       array( 'page_restrictions', 'pr_id',            'patch-page_restrictions_sortkey.sql' ),
+       array( 'revision',      'rev_len',              'patch-rev_len.sql' ),
 );
 
 function rename_table( $from, $to, $patch ) {
@@ -57,7 +78,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 {
@@ -73,7 +94,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";
        }
 }
@@ -86,7 +107,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";
        }
 }
@@ -100,7 +121,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" .
@@ -128,16 +149,16 @@ function update_passwords() {
 
 function do_interwiki_update() {
        # Check that interwiki table exists; if it doesn't source it
-       global $wgDatabase;
+       global $wgDatabase, $IP;
        if( $wgDatabase->tableExists( "interwiki" ) ) {
                echo "...already have interwiki table\n";
                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" );
+       dbsource( "$IP/maintenance/interwiki.sql" );
        echo "ok\n";
 }
 
@@ -147,7 +168,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;
        }
@@ -155,26 +176,71 @@ 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 );
+               dbsource( archive( '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";
        }
 }
 
@@ -182,47 +248,38 @@ 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";
 }
 
 
@@ -230,43 +287,31 @@ function do_user_update() {
        global $wgDatabase;
        if( $wgDatabase->fieldExists( 'user', 'user_emailauthenticationtimestamp' ) ) {
                echo "User table contains old email authentication field. Dropping... ";
-               dbsource( "maintenance/archives/patch-email-authentication.sql", $wgDatabase );
+               dbsource( archive( 'patch-email-authentication.sql' ), $wgDatabase );
                echo "ok\n";
        } else {
                echo "...user table does not contain old email authentication field.\n";
        }
 }
 
-# Assumes that the groups table has been added.
-function do_group_update() {
-       global $wgDatabase;
-       $res = $wgDatabase->safeQuery( 'SELECT COUNT(*) AS c FROM !',
-               $wgDatabase->tableName( 'groups' ) );
-       $row = $wgDatabase->fetchObject( $res );
-       $wgDatabase->freeResult( $res );
-       if( $row->c == 0 ) {
-               echo "Adding default group definitions... ";
-               dbsource( "maintenance/archives/patch-userlevels-defaultgroups.sql", $wgDatabase );
-               echo "ok\n";
-       }
-}
-
 /**
  * 1.4 betas were missing the 'binary' marker from logging.log_title,
  * 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 {
                echo "Fixing title encoding on logging table... ";
-               dbsource( 'maintenance/archives/patch-logging-title.sql', $wgDatabase );
+               dbsource( archive( 'patch-logging-title.sql' ), $wgDatabase );
                echo "ok\n";
        }
 }
@@ -278,16 +323,16 @@ function do_schema_restructuring() {
                echo "...page table already exists.\n";
        } else {
                echo "...converting from cur/old to page/revision/text DB structure.\n"; flush();
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                echo "......checking for duplicate entries.\n"; flush();
-               
-               extract( $wgDatabase->tableNames( 'cur', 'old', 'page', 'revision', 'text' ) );
+
+               list ($cur, $old, $page, $revision, $text) = $wgDatabase->tableNamesN( 'cur', 'old', 'page', 'revision', 'text' );
 
                $rows = $wgDatabase->query( "SELECT cur_title, cur_namespace, COUNT(cur_namespace) AS c
                                FROM $cur GROUP BY cur_title, cur_namespace HAVING c>1", $fname );
 
                if ( $wgDatabase->numRows( $rows ) > 0 ) {
-                       echo wfTimestamp();
+                       echo wfTimestamp( TS_DB );
                        echo "......<b>Found duplicate entries</b>\n";
                        echo ( sprintf( "<b>      %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
                        while ( $row = $wgDatabase->fetchObject( $rows ) ) {
@@ -298,7 +343,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;
@@ -335,18 +380,18 @@ function do_schema_restructuring() {
                        }
                        $sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
                        $rows = $wgDatabase->query( $sql, $fname );
-                       echo wfTimestamp();
+                       echo wfTimestamp( TS_DB );
                        echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
                }
-               
 
-               echo wfTimestamp();
+
+               echo wfTimestamp( TS_DB );
                echo "......Creating tables.\n";
                $wgDatabase->query("CREATE TABLE $page (
                        page_id int(8) unsigned NOT NULL auto_increment,
                        page_namespace int NOT NULL,
                        page_title varchar(255) binary NOT NULL,
-                       page_restrictions tinyblob NOT NULL default '',
+                       page_restrictions tinyblob NOT NULL,
                        page_counter bigint(20) unsigned NOT NULL default '0',
                        page_is_redirect tinyint(1) unsigned NOT NULL default '0',
                        page_is_new tinyint(1) unsigned NOT NULL default '0',
@@ -363,13 +408,13 @@ function do_schema_restructuring() {
                $wgDatabase->query("CREATE TABLE $revision (
                        rev_id int(8) unsigned NOT NULL auto_increment,
                        rev_page int(8) unsigned NOT NULL,
-                       rev_comment tinyblob NOT NULL default '',
+                       rev_comment tinyblob NOT NULL,
                        rev_user int(5) unsigned NOT NULL default '0',
                        rev_user_text varchar(255) binary NOT NULL default '',
                        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),
@@ -378,15 +423,15 @@ function do_schema_restructuring() {
                        INDEX usertext_timestamp (rev_user_text,rev_timestamp)
                        ) TYPE=InnoDB", $fname );
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                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 );
-               echo wfTimestamp();
+               $maxold = intval( $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname ) );
+               echo wfTimestamp( TS_DB );
                echo "......maxold is {$maxold}\n";
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                global $wgLegacySchemaConversion;
                if( $wgLegacySchemaConversion ) {
                        // Create HistoryBlobCurStub entries.
@@ -406,7 +451,7 @@ function do_schema_restructuring() {
                        SELECT cur_namespace, cur_title, $cur_text, cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit, $cur_flags
                        FROM $cur", $fname );
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                echo "......Setting up revision table.\n";
                $wgDatabase->query( "INSERT INTO $revision (rev_id, rev_page, rev_comment, rev_user, rev_user_text, rev_timestamp,
                                rev_minor_edit)
@@ -414,7 +459,7 @@ function do_schema_restructuring() {
                                old_timestamp, old_minor_edit
                        FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                echo "......Setting up page table.\n";
                $wgDatabase->query( "INSERT INTO $page (page_id, page_namespace, page_title, page_restrictions, page_counter,
                                page_is_redirect, page_is_new, page_random, page_touched, page_latest, page_len)
@@ -423,25 +468,24 @@ function do_schema_restructuring() {
                        FROM $cur,$revision
                        WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", $fname );
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                echo "......Unlocking tables.\n";
                $wgDatabase->query( "UNLOCK TABLES", $fname );
 
-               echo wfTimestamp();
+               echo wfTimestamp( TS_DB );
                echo "......Renaming old.\n";
                $wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
-               
-               echo wfTimestamp();
+
+               echo wfTimestamp( TS_DB );
                echo "...done.\n";
        }
 }
 
 function do_inverse_timestamp() {
        global $wgDatabase;
-       $fname="do_schema_restructuring";
        if( $wgDatabase->fieldExists( 'revision', 'inverse_timestamp' ) ) {
                echo "Removing revision.inverse_timestamp and fixing indexes... ";
-               dbsource( 'maintenance/archives/patch-inverse_timestamp.sql', $wgDatabase );
+               dbsource( archive( 'patch-inverse_timestamp.sql' ), $wgDatabase );
                echo "ok\n";
        } else {
                echo "revision timestamp indexes already up to 2005-03-13\n";
@@ -454,7 +498,7 @@ function do_text_id() {
                echo "...rev_text_id already in place.\n";
        } else {
                echo "Adding rev_text_id field... ";
-               dbsource( 'maintenance/archives/patch-rev_text_id.sql', $wgDatabase );
+               dbsource( archive( 'patch-rev_text_id.sql' ), $wgDatabase );
                echo "ok\n";
        }
 }
@@ -475,22 +519,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";
        }
 }
@@ -501,10 +547,10 @@ function do_pagelinks_update() {
                echo "...already have pagelinks table.\n";
        } else {
                echo "Converting links and brokenlinks tables to pagelinks... ";
-               dbsource( "maintenance/archives/patch-pagelinks.sql", $wgDatabase );
+               dbsource( archive( 'patch-pagelinks.sql' ), $wgDatabase );
                echo "ok\n";
                flush();
-               
+
                global $wgCanonicalNamespaceNames;
                foreach( $wgCanonicalNamespaceNames as $ns => $name ) {
                        if( $ns != 0 ) {
@@ -516,31 +562,31 @@ 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 );
+               dbsource( archive( 'patch-drop_img_type.sql' ), $wgDatabase );
                echo "ok\n";
        } else {
                echo "No img_type field in image table; Good.\n";
@@ -556,9 +602,267 @@ function do_old_links_update() {
        }
 }
 
-function do_all_updates() {
-       global $wgNewTables, $wgNewFields, $wgRenamedTables;
-       
+function do_user_unique_update() {
+       global $wgDatabase;
+       $duper = new UserDupes( $wgDatabase );
+       if( $duper->hasUniqueIndex() ) {
+               echo "Already have unique user_name index.\n";
+       } else {
+               if( !$duper->clearDupes() ) {
+                       echo "WARNING: This next step will probably fail due to unfixed duplicates...\n";
+               }
+               echo "Adding unique index on user_name... ";
+               dbsource( archive( 'patch-user_nameindex.sql' ), $wgDatabase );
+               echo "ok\n";
+       }
+}
+
+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( archive( '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...";
+                       dbsource( archive( 'patch-user_rights.sql' ), $wgDatabase );
+                       echo "ok\n";
+               } else {
+                       echo "*** WARNING: couldn't locate user_rights table or field for upgrade.\n";
+                       echo "*** You may need to manually configure some sysops by manipulating\n";
+                       echo "*** the user_groups table.\n";
+                       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(
+                                       'ug_user'  => $row->ur_user,
+                                       'ug_group' => $group ),
+                               $fname );
+               }
+       }
+       $wgDatabase->freeResult( $result );
+       echo "ok\n";
+}
+
+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( archive( '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";
+               echo "***\n";
+       } else {
+               echo "...user_groups is in current format.\n";
+       }
+
+}
+
+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( archive( '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";
+}
+
+# July 2006
+# Add ( rc_namespace, rc_user_text ) index [R. Church]
+function do_rc_indices_update() {
+       global $wgDatabase;
+       echo( "Checking for additional recent changes indices...\n" );
+       # See if we can find the index we want
+       $info = $wgDatabase->indexInfo( 'recentchanges', 'rc_ns_usertext', __METHOD__ );
+       if( !$info ) {
+               # None, so create
+               echo( "...index on ( rc_namespace, rc_user_text ) not found; creating\n" );
+               dbsource( archive( 'patch-recentchanges-utindex.sql' ) );
+       } else {
+               # Index seems to exist
+               echo( "...index on ( rc_namespace, rc_user_text ) seems to be ok\n" );
+       }
+
+       #Add (rc_user_text, rc_timestamp) index [A. Garrett], November 2006
+       # See if we can find the index we want
+       $info = $wgDatabase->indexInfo( 'recentchanges', 'rc_user_text', __METHOD__ );
+       if( !$info ) {
+               # None, so create
+               echo( "...index on ( rc_user_text, rc_timestamp ) not found; creating\n" );
+               dbsource( archive( 'patch-rc_user_text-index.sql' ) );
+       } else {
+               # Index seems to exist
+               echo( "...index on ( rc_user_text, rc_timestamp ) seems to be ok\n" );
+       }
+}
+
+function index_has_field($table, $index, $field) {
+       global $wgDatabase;
+       echo( "Checking if $table index $index includes field $field...\n" );
+       $info = $wgDatabase->indexInfo( $table, $index, __METHOD__ );
+       if( $info ) {
+               foreach($info as $row) {
+                       if($row->Column_name == $field) {
+                               echo( "...index $index on table $table seems to be ok\n" );
+                               return true;
+                       }
+               }
+       }
+       echo( "...index $index on table $table has no field $field; adding\n" );
+       return false;
+}
+
+function do_backlinking_indices_update() {
+       echo( "Checking for backlinking indices...\n" );
+       if (!index_has_field('pagelinks', 'pl_namespace', 'pl_from') ||
+               !index_has_field('templatelinks', 'tl_namespace', 'tl_from') ||
+               !index_has_field('imagelinks', 'il_to', 'il_from'))
+       {       
+               dbsource( archive( 'patch-backlinkindexes.sql' ) );
+       }
+}
+
+function do_stats_init() {
+       // Sometimes site_stats table is not properly populated.
+       global $wgDatabase;
+       echo "Checking site_stats row...";
+       $row = $wgDatabase->selectRow( 'site_stats', '*', array( 'ss_row_id' => 1 ), __METHOD__ );
+       if( $row === false ) {
+               echo "data is missing! rebuilding...\n";
+               
+               global $IP;
+               require_once "$IP/maintenance/initStats.inc";
+               wfInitStats();
+       } else {
+               echo "ok.\n";
+       }
+}
+
+function purge_cache() {
+       global $wgDatabase;
+       # We can't guarantee that the user will be able to use TRUNCATE,
+       # but we know that DELETE is available to us
+       echo( "Purging caches..." );
+       $wgDatabase->delete( 'objectcache', '*', __METHOD__ );
+       echo( "done.\n" );
+}
+
+function do_all_updates( $shared = false, $purge = true ) {
+       global $wgNewTables, $wgNewFields, $wgRenamedTables, $wgSharedDB, $wgDatabase, $wgDBtype, $IP;
+
+       $doUser = !$wgSharedDB || $shared;
+
+       if ($wgDBtype === 'postgres') {
+               do_postgres_updates();
+               return;
+       }
+
        # Rename tables
        foreach ( $wgRenamedTables as $tableRecord ) {
                rename_table( $tableRecord[0], $tableRecord[1], $tableRecord[2] );
@@ -572,12 +876,11 @@ 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();
        }
-       
-       # Add default group data
-       do_group_update(); flush();
 
        # Do schema updates which require special handling
        do_interwiki_update(); flush();
@@ -585,20 +888,529 @@ function do_all_updates() {
        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();
+
+       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();
+       
+       do_rc_indices_update(); flush();
+
+       add_table( 'redirect', 'patch-redirect.sql' );
+
+       do_backlinking_indices_update(); flush();
+
+       do_restrictions_update(); flush ();
+
+       echo "Deleting old default messages (this may take a long time!)..."; flush();
+       deleteDefaultMessages();
+       echo "Done\n"; flush();
+       
+       do_stats_init(); flush();
+       
+       if( $purge ) {
+               purge_cache();
+               flush();
+       }
+}
+
+function archive($name) {
+       global $wgDBtype, $IP;
+       switch ($wgDBtype) {
+       case "postgres":
+               return "$IP/maintenance/postgres/archives/$name";
+       default:
+               return "$IP/maintenance/archives/$name";
+       }
+}
+
+function do_restrictions_update() {
+       # Adding page_restrictions table, obsoleting page.page_restrictions.
+       #  Migrating old restrictions to new table
+       # -- Andrew Garrett, January 2007.
+
+       global $wgDatabase;
+
+       $name = 'page_restrictions';
+       $patch = 'patch-page_restrictions.sql';
+
+       if ( $wgDatabase->tableExists( $name ) ) {
+               echo "...$name table already exists.\n";
+       } else {
+               echo "Creating $name table...";
+               dbsource( archive($patch), $wgDatabase );
+               echo "ok\n";
+
+               echo "Migrating old restrictions to new table...";
+
+               $res = $wgDatabase->select( 'page', array( 'page_id', 'page_restrictions' ), array("page_restrictions!=''", "page_restrictions!='edit=:move='"), __METHOD__ );
+
+               $count = 0;
+
+               while ($row = $wgDatabase->fetchObject($res) ) {
+                       $count = ($count + 1) % 100;
+
+                       if ($count == 0) {
+                               if ( function_exists( 'wfWaitForSlaves' ) ) {
+                                       wfWaitForSlaves( 10 );
+                               } else {
+                                       sleep( 1 );
+                               }
+                       }
+
+                       # Figure out what the restrictions are..
+                       $id = $row->page_id;
+                       $flatrestrictions = explode( ':', $row->page_restrictions );
+
+                       $restrictions = array ();
+                       foreach( $flatrestrictions as $restriction ) {
+                               $thisrestriction = explode( '=', $restriction, 2 );
+                               if( count( $thisrestriction ) == 1 ) {
+                                       // Compatibility with old protections from before
+                                       // separate move protection was added.
+                                       list( $level ) = $thisrestriction;
+                                       if( $level ) {
+                                               $restrictions['edit'] = $level;
+                                               $restrictions['move'] = $level;
+                                       }
+                               } else {
+                                       list( $type, $level ) = $thisrestriction;
+                                       if( $level ) {
+                                               $restrictions[$type] = $level;
+                                       }
+                               }
+
+                       $wgDatabase->update( 'page', array ( 'page_restrictions' => ''), array( 'page_id' => $id ), __METHOD__ );
+
+                       }
+                       
+                       foreach( $restrictions as $type => $level ) {
+                               $wgDatabase->insert( 'page_restrictions', array ( 'pr_page' => $id,
+                                                                                       'pr_type' => $type,
+                                                                                       'pr_level' => $level,
+                                                                                       'pr_cascade' => 0 ),
+                                                                                       __METHOD__ );
+                       }
+               }
+               print "ok\n";
+       }
        
-       initialiseMessages(); flush();
+}
+
+function
+pg_describe_table($table)
+{
+global $wgDatabase, $wgDBmwschema;
+       $q = <<<END
+SELECT attname, attnum FROM pg_namespace, pg_class, pg_attribute
+       WHERE pg_class.relnamespace = pg_namespace.oid 
+         AND attrelid=pg_class.oid AND attnum > 0
+         AND relname=%s AND nspname=%s
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($wgDBmwschema)));
+       if (!$res)
+               return null;
+
+       $cols = array();
+       while ($r = $wgDatabase->fetchRow($res)) {
+               $cols[] = array(        
+                               "name" => $r[0],
+                               "ord" => $r[1],
+                       );
+       }
+       return $cols;
+}
+
+function
+pg_describe_index($idx)
+{
+global $wgDatabase, $wgDBmwschema;
+
+       // first fetch the key (which is a list of columns ords) and
+       // the table the index applies to (an oid)
+       $q = <<<END
+SELECT indkey, indrelid FROM pg_namespace, pg_class, pg_index
+       WHERE nspname=%s
+         AND pg_class.relnamespace = pg_namespace.oid
+         AND relname=%s
+         AND indexrelid=pg_class.oid
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($idx)));
+       if (!$res)
+               return null;
+       if (!($r = $wgDatabase->fetchRow($res))) {
+               $wgDatabase->freeResult($res);
+               return null;
+       }
+
+       $indkey = $r[0];
+       $relid = intval($r[1]);
+       $indkeys = explode(" ", $indkey);
+       $wgDatabase->freeResult($res);
+
+       $colnames = array();
+       foreach ($indkeys as $rid) {
+               $query = <<<END
+SELECT attname FROM pg_class, pg_attribute
+       WHERE attrelid=$relid
+         AND attnum=%d
+         AND attrelid=pg_class.oid
+END;
+               $r2 = $wgDatabase->query(sprintf($query, $rid));
+               if (!$r2)
+                       return null;
+               if (!($row2 = $wgDatabase->fetchRow($r2))) {
+                       $wgDatabase->freeResult($r2);
+                       return null;
+               }
+               $colnames[] = $row2[0];
+               $wgDatabase->freeResult($r2);
+       }
+
+       return $colnames;
+}
+
+function
+pg_column_has_type($table, $column, $wanttype)
+{
+global $wgDatabase, $wgDBname, $wgDBmwschema;
+
+       $q = <<<END
+SELECT typname FROM pg_class, pg_namespace, pg_attribute, pg_type
+       WHERE relnamespace=pg_namespace.oid AND relkind='r'
+             AND attrelid=pg_class.oid AND atttypid=pg_type.oid
+             AND nspname=%s AND relname=%s AND attname=%s;
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($column)));
+       $row = $wgDatabase->fetchRow($res);
+       $istype = false;
+       if ($row)
+               $istype = $row[0] === $wanttype;
+       $wgDatabase->freeResult($res);
+       return $istype;
+}
+
+function
+pg_column_exists($table, $column)
+{
+global $wgDatabase, $wgDBname, $wgDBmwschema;
+
+       $q = <<<END
+SELECT 1 FROM pg_class, pg_namespace, pg_attribute
+       WHERE relnamespace=pg_namespace.oid AND relkind='r'
+             AND attrelid=pg_class.oid
+             AND nspname=%s AND relname=%s AND attname=%s;
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($column)));
+       $row = $wgDatabase->fetchRow($res);
+       $exists = !!$row;
+       $wgDatabase->freeResult($res);
+       return $exists;
+}
+
+function
+pg_column_is_nullable($table, $column)
+{
+global $wgDatabase, $wgDBname, $wgDBmwschema;
+
+       $q = <<<END
+SELECT attnotnull FROM pg_class, pg_namespace, pg_attribute
+       WHERE relnamespace=pg_namespace.oid AND relkind='r'
+             AND attrelid=pg_class.oid
+             AND nspname=%s AND relname=%s AND attname=%s;
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($column)));
+       $row = $wgDatabase->fetchRow($res);
+       $nullable = ($row[0] === 'f');
+       $wgDatabase->freeResult($res);
+       return $nullable;
+}
+
+function
+pg_table_exists($table)
+{
+global $wgDatabase, $wgDBname, $wgDBmwschema;
+
+       $q = <<<END
+SELECT 1 FROM pg_class, pg_namespace
+       WHERE relnamespace=pg_namespace.oid AND relkind='r'
+             AND nspname=%s AND relname=%s
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table)));
+       $row = $wgDatabase->fetchRow($res);
+       $exists = !!$row;
+       $wgDatabase->freeResult($res);
+       return $exists;
+}
+
+function
+pg_trigger_exists($table, $trigger)
+{
+global $wgDatabase, $wgDBname, $wgDBmwschema;
+
+       $q = <<<END
+SELECT 1 FROM pg_class, pg_namespace, pg_trigger
+       WHERE relnamespace=pg_namespace.oid AND relkind='r'
+             AND tgrelid=pg_class.oid
+             AND nspname=%s AND relname=%s AND tgname=%s
+END;
+       $res = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($trigger)));
+       $row = $wgDatabase->fetchRow($res);
+       $exists = !!$row;
+       $wgDatabase->freeResult($res);
+       return $exists;
+}
+
+
+function
+pg_index_exists($table, $index)
+{
+global $wgDatabase, $wgDBmwschema;
+       $exists = $wgDatabase->selectField("pg_indexes", "indexname",
+                       array(  "indexname" => $index,
+                               "tablename" => $table,
+                               "schemaname" => $wgDBmwschema));
+       return $exists === $index;
+}
+
+function
+pg_rule_exists($table, $rule)
+{
+global $wgDatabase, $wgDBmwschema;
+       $exists = $wgDatabase->selectField("pg_rules", "rulename",
+                       array(  "rulename" => $rule,
+                               "tablename" => $table,
+                               "schemaname" => $wgDBmwschema));
+       return $exists === $rule;
+}
+
+function
+pg_fkey_deltype($fkey)
+{
+global $wgDatabase, $wgDBmwschema;
+       $q = <<<END
+SELECT confdeltype FROM pg_constraint, pg_namespace
+       WHERE connamespace=pg_namespace.oid
+         AND nspname=%s
+         AND conname=%s;
+END;
+       $r = $wgDatabase->query(sprintf($q,
+               $wgDatabase->addQuotes($wgDBmwschema),
+               $wgDatabase->addQuotes($fkey)));
+       if (!($row = $wgDatabase->fetchRow($r)))
+               return null;
+       return $row[0];
+}
+
+function
+pg_rule_def($table, $rule)
+{
+global $wgDatabase, $wgDBmwschema;
+       $q = <<<END
+SELECT definition FROM pg_rules
+       WHERE schemaname = %s
+         AND tablename = %s
+         AND rulename = %s
+END;
+       $r = $wgDatabase->query(sprintf($q,
+                       $wgDatabase->addQuotes($wgDBmwschema),
+                       $wgDatabase->addQuotes($table),
+                       $wgDatabase->addQuotes($rule)));
+       $row = $wgDatabase->fetchRow($r);
+       if (!$row)
+               return null;
+       $d = $row[0];
+       $wgDatabase->freeResult($r);
+       return $d;
+}
+
+function do_postgres_updates() {
+       global $wgDatabase, $wgVersion, $wgDBmwschema;
+
+       # Just in case their LocalSetings.php does not have this:
+       if ( !isset( $wgDBmwschema ))
+               $wgDBmwschema = 'mediawiki';
+
+       $typechanges = array(
+               array("oldimage",     "oi_size",    "int4"),
+               array("oldimage",     "oi_width",   "int4"),
+               array("oldimage",     "oi_height",  "int4"),
+               array("image",        "img_size",   "int4"),
+               array("image",        "img_width",  "int4"),
+               array("image",        "img_height", "int4"),
+       );
+
+       $newcols = array(
+               array("mwuser",        "user_newpass_time",    "TIMESTAMPTZ"),
+               array("mwuser",        "user_editcount",       "INTEGER"),
+               array("ipblocks",      "ipb_anon_only",        "CHAR NOT NULL DEFAULT '0'"),
+               array("ipblocks",      "ipb_create_account",   "CHAR NOT NULL DEFAULT '1'"),
+               array("ipblocks",      "ipb_enable_autoblock", "CHAR NOT NULL DEFAULT '1'"),
+               array("recentchanges", "rc_old_len",           "INT"),
+               array("recentchanges", "rc_new_len",           "INT"),
+               array("revision",      "rev_len",              "INT")
+       );
+
+       $newtables = array(
+               array("mwuser",            "patch-mwuser.sql"),
+               array("pagecontent",       "patch-pagecontent.sql"),
+               array("querycachetwo",     "patch-querycachetwo.sql"),
+               array("redirect",          "patch-redirect.sql"),
+               array("page_restrictions", "patch-page_restrictions.sql"),
+               array("profiling",         "patch-profiling.sql"),
+               array("mediawiki_version", "patch-mediawiki_version.sql"),
+               array("archive2",          "patch-archive2.sql")
+       );
+
+       $newindexes = array(
+               array("revision", "rev_text_id_idx",          "patch-rev_text_id_idx.sql")
+       );
+
+       $newrules = array(
+               array("archive", "archive_delete", "patch-archive_delete.sql")
+       );
+
+       foreach ($newtables as $nt) {
+               if (pg_table_exists($nt[0])) {
+                       echo "... table $nt[0] already exists\n";
+                       continue;
+               }
+
+               echo "... create table $nt[0]\n";
+               dbsource(archive($nt[1]));
+       }
+
+       foreach ($newcols as $nc) {
+               if (pg_column_exists($nc[0], $nc[1])) {
+                       echo "... column $nc[0].$nc[1] already exists\n";
+                       continue;
+               }
+
+               echo "... add column $nc[0].$nc[1]\n";
+               $wgDatabase->query("ALTER TABLE $nc[0] ADD $nc[1] $nc[2]");
+       }
+
+       foreach ($typechanges as $tc) {
+               if (!pg_column_exists($tc[0], $tc[1])) {
+                       echo "... error: expected column $tc[0].$tc[1] to exist\n";
+                       exit(1);
+               }
+
+               if (pg_column_has_type($tc[0], $tc[1], $tc[2]))
+                       echo "... $tc[0].$tc[1] is already $tc[2]\n";
+               else {
+                       echo "... change $tc[0].$tc[1] to $tc[2]\n";
+                       $wgDatabase->query("ALTER TABLE $tc[0] ALTER $tc[1] TYPE $tc[2];\nCOMMIT;\n");
+               }
+       }
+
+       if (!pg_column_has_type("user_newtalk", "user_ip", "text")) {
+               echo "... convert user_newtalk.user_ip to text\n";
+               $wgDatabase->query("ALTER TABLE user_newtalk ALTER user_ip TYPE TEXT USING host(user_ip)");
+       }
+
+       foreach ($newindexes as $ni) {
+               if (pg_index_exists($ni[0], $ni[1])) {
+                       echo "... index $ni[1] on $ni[0] already exists\n";
+                       continue;
+               }
+               dbsource(archive($ni[2]));
+       }
+
+       foreach ($newrules as $nr) {
+               if (pg_rule_exists($nr[0], $nr[1])) {
+                       echo "... rule $nr[1] on $nr[0] already exists\n";
+                       continue;
+               }
+               dbsource(archive($nr[2]));
+       }
+
+       if (!pg_column_has_type("ipblocks", "ipb_address", "text")) {
+               echo "... change ipblocks.ipb_address to TEXT\n";
+               $wgDatabase->query("ALTER TABLE ipblocks ALTER ipb_address TYPE TEXT USING ipb_address::TEXT");
+       } else
+               echo "... ipblocks.ipb_address is already TEXT\n";
+
+       if (!pg_trigger_exists("page", "page_deleted")) {
+               echo "... create page_deleted trigger\n";
+               dbsource(archive('patch-page_deleted.sql'));
+       }
+
+       if (!pg_column_is_nullable("recentchanges", "rc_cur_id")) {
+               echo "... remove NOT NULL constraint on recentchanges.rc_cur_id\n";
+               dbsource(archive('patch-rc_cur_id-not-null.sql'));
+       }
+
+       $pu = pg_describe_index("pagelink_unique");
+       if (!is_null($pu) && ($pu[0] != "pl_from" || $pu[1] != "pl_namespace" || $pu[2] != "pl_title")) {
+               echo "... dropping obsolete pagelink_unique index\n";
+               $wgDatabase->query("DROP INDEX pagelink_unique");
+               $pu = null;
+       } else
+               echo "... obsolete pagelink_unique index not present\n";
+
+       if (is_null($pu)) {
+               echo "... adding new pagelink_unique index\n";
+               $wgDatabase->query("CREATE UNIQUE INDEX pagelink_unique ON pagelinks (pl_from,pl_namespace,pl_title)");
+       } else
+               echo "... already have current pagelink_unique index\n";
+
+       if (pg_fkey_deltype("revision_rev_user_fkey") == 'r') {
+               echo "... revision_rev_user_fkey is already ON DELETE RESTRICT\n";
+       } else {
+               echo "... change revision_rev_user_fkey to ON DELETE RESTRICT\n";
+               dbsource(archive('patch-revision_rev_user_fkey.sql'));
+       }
+
+       $ai_def = pg_rule_def("archive", "archive_insert");
+       if (strstr($ai_def, "to_date") !== false) {
+               echo "... fix archive_insert rule\n";
+               dbsource(archive('patch-archive_insert.sql'));
+       } else
+               echo "... already have correct archive_insert rule\n";
+
+       return;
 }
 
 ?>