Renamed group table to groups, and renamed the fields from group_xxx to gr_xxx. Added...
[lhc/web/wiklou.git] / maintenance / updaters.inc
index 5a8632e..4399f52 100644 (file)
@@ -8,7 +8,11 @@
 
 require_once 'convertLinks.inc';
 require_once 'InitialiseMessages.inc';
-require_once 'archives/moveCustomMessages.inc';
+
+$wgRenamedTables = array(
+#           from             to                  patch file
+       array( 'group',         'groups',           'patch-rename-group.sql' ),
+);
 
 $wgNewTables = array(
 #            table          patch file (in maintenance/archives)
@@ -19,6 +23,7 @@ $wgNewTables = array(
        array( 'categorylinks', 'patch-categorylinks.sql' ),
        array( 'logging',       'patch-logging.sql' ),
        array( 'user_rights',   'patch-user_rights.sql' ),
+       array( 'groups',        'patch-userlevels.sql' ),
 );
 
 $wgNewFields = array(
@@ -31,9 +36,35 @@ $wgNewFields = array(
        array( 'recentchanges', 'rc_patrolled',     'patch-rc-patrol.sql' ),
        array( 'user',          'user_real_name',   'patch-user-realname.sql' ),
        array( 'user',          'user_token',       'patch-user_token.sql' ),
-       array( 'user_rights',   'ur_user',           'patch-rename-user_groups-and_rights.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( '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' ),
+       array( 'page',          'page_len',         'patch-page_len.sql' ),
+       array( 'revision',      'rev_deleted',      'patch-rev_deleted.sql' ),
+       array( 'image',         'img_width',        'patch-img_width.sql' ),
+       array( 'image',         'img_metadata',     'patch-img_metadata.sql' ),
 );
 
+function rename_table( $from, $to, $patch ) {
+       global $wgDatabase;
+       if ( $wgDatabase->tableExists( $from ) ) {
+               if ( $wgDatabase->tableExists( $to ) ) {
+                       echo "...can't move table $from to $to, $to already exists.\n";
+               } else {
+                       echo "Moving table $from to $to...";
+                       dbsource( "maintenance/archives/$patch", $wgDatabase );
+                       echo "ok\n";
+               }
+       } else {
+               // Source table does not exist
+               // Renames are done before creations, so this is typical for a new installation
+               // Ignore silently
+       }
+}
+
 function add_table( $name, $patch ) {
        global $wgDatabase;
        if ( $wgDatabase->tableExists( $name ) ) {
@@ -47,7 +78,9 @@ function add_table( $name, $patch ) {
 
 function add_field( $table, $field, $patch ) {
        global $wgDatabase;
-       if ( $wgDatabase->fieldExists( $table, $field ) ) {
+       if ( !$wgDatabase->tableExists( $table ) ) {
+               echo "...$table table does not exist, skipping new field patch\n";
+       } elseif ( $wgDatabase->fieldExists( $table, $field ) ) {
                echo "...have $field field in $table table.\n";
        } else {
                echo "Adding $field field to table $table...";
@@ -64,6 +97,8 @@ 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" .
@@ -121,7 +156,7 @@ function do_index_update() {
 function do_linkscc_1_3_update() {
        // Update linkscc table to 1.3 schema if necessary
        global $wgDatabase, $wgVersion;
-       if( ( strpos( "1.3", $wgVersion ) === 0 ) && $wgDatabase->tableExists( "linkscc" )
+       if( $wgDatabase->tableExists( "linkscc" )
                && $wgDatabase->fieldExists( "linkscc", "lcc_title" ) ) {
                echo "Altering lcc_title field from linkscc table... ";
                dbsource( "maintenance/archives/patch-linkscc-1.3.sql", $wgDatabase );
@@ -142,9 +177,343 @@ function do_image_name_unique_update() {
        }
 }
 
+function do_watchlist_update() {
+       global $wgDatabase;
+       if( $wgDatabase->fieldExists( 'watchlist', 'wl_notificationtimestamp' ) ) {
+               echo "ENOTIF: The watchlist table is already set up for email notification.\n";
+       } else {
+               echo "ENOTIF: 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";
+       }
+}
+
+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);
+                               $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: ====> watchlist: user_id='.$user->getID().' '.$user->getName()."\n";
+                       }
+               }
+               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";
+       }
+}
+
+
+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 );
+               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;
+       $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 );
+               echo "ok\n";
+       }
+}
+
+function do_schema_restructuring() {
+       global $wgDatabase;
+       $fname="do_schema_restructuring";
+       if ( $wgDatabase->tableExists( 'page' ) ) {
+               echo "...page table already exists.\n";
+       } else {
+               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
+                               FROM $cur GROUP BY cur_title, cur_namespace HAVING c>1", $fname );
+
+               if ( $wgDatabase->numRows( $rows ) > 0 ) {
+                       echo wfTimestamp();
+                       echo "......<b>Found duplicate entries</b>\n";
+                       echo ( sprintf( "<b>      %-60s %3s %5s</b>\n", 'Title', 'NS', 'Count' ) );
+                       while ( $row = $wgDatabase->fetchObject( $rows ) ) {
+                               if ( ! isset( $duplicate[$row->cur_namespace] ) ) {
+                                       $duplicate[$row->cur_namespace] = array();
+                               }
+                               $duplicate[$row->cur_namespace][] = $row->cur_title;
+                               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; 
+                       foreach ( $duplicate as $ns => $titles ) {
+                               if ( $firstCond ) {
+                                       $firstCond = false;
+                               } else {
+                                       $sql .= ' OR ';
+                               }
+                               $sql .= "( cur_namespace = {$ns} AND cur_title in (";
+                               $first = true;
+                               foreach ( $titles as $t ) {
+                                       if ( $first ) {
+                                               $sql .= $wgDatabase->addQuotes( $t );
+                                               $first = false;
+                                       } else {
+                                               $sql .= ', ' . $wgDatabase->addQuotes( $t );
+                                       }
+                               }
+                               $sql .= ") ) \n";
+                       }
+                       # By sorting descending, the most recent entry will be the first in the list.
+                       # All following entries will be deleted by the next while-loop.
+                       $sql .= 'ORDER BY cur_namespace, cur_title, cur_timestamp DESC';
+
+                       $rows = $wgDatabase->query( $sql, $fname );
+
+                       $prev_title = $prev_namespace = false;
+                       $deleteId = array();
+
+                       while ( $row = $wgDatabase->fetchObject( $rows ) ) {
+                               if ( $prev_title == $row->cur_title && $prev_namespace == $row->cur_namespace ) {
+                                       $deleteId[] = $row->cur_id;
+                               }
+                               $prev_title     = $row->cur_title;
+                               $prev_namespace = $row->cur_namespace;
+                       }
+                       $sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
+                       $rows = $wgDatabase->query( $sql, $fname );
+                       echo wfTimestamp();
+                       echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
+               }
+               
+
+               echo wfTimestamp();
+               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_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',
+                       page_random real unsigned NOT NULL,
+                       page_touched char(14) binary NOT NULL default '',
+                       page_latest int(8) unsigned NOT NULL,
+                       page_len int(8) unsigned NOT NULL,
+
+                       PRIMARY KEY page_id (page_id),
+                       UNIQUE INDEX name_title (page_namespace,page_title),
+                       INDEX (page_random),
+                       INDEX (page_len)
+                       ) TYPE=InnoDB", $fname );
+               $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_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),
+                       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 );
+
+               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 );
+               echo wfTimestamp();
+               echo "......maxold is {$maxold}\n";
+
+               echo wfTimestamp();
+               global $wgLegacySchemaConversion;
+               if( $wgLegacySchemaConversion ) {
+                       // Create HistoryBlobCurStub entries.
+                       // Text will be pulled from the leftover 'cur' table at runtime.
+                       echo "......Moving metadata from cur; using blob references to text in cur table.\n";
+                       $cur_text = "concat('O:18:\"historyblobcurstub\":1:{s:6:\"mCurId\";i:',cur_id,';}')";
+                       $cur_flags = "'object'";
+               } else {
+                       // Copy all cur text in immediately: this may take longer but avoids
+                       // having to keep an extra table around.
+                       echo "......Moving text from cur.\n";
+                       $cur_text = 'cur_text';
+                       $cur_flags = "''";
+               }
+               $wgDatabase->query( "INSERT INTO $old (old_namespace, old_title, old_text, old_comment, old_user, old_user_text,
+                               old_timestamp, old_minor_edit, old_flags)
+                       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 "......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)
+                       SELECT old_id, cur_id, old_comment, old_user, old_user_text,
+                               old_timestamp, old_minor_edit
+                       FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
+
+               echo wfTimestamp();
+               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)
+                       SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, cur_is_redirect, cur_is_new,
+                               cur_random, cur_touched, rev_id, LENGTH(cur_text)
+                       FROM $cur,$revision
+                       WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", $fname );
+
+               echo wfTimestamp();
+               echo "......Unlocking tables.\n";
+               $wgDatabase->query( "UNLOCK TABLES", $fname );
+
+               echo wfTimestamp();
+               echo "......Renaming old.\n";
+               $wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
+               
+               echo wfTimestamp();
+               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 );
+               echo "ok\n";
+       } else {
+               echo "revision timestamp indexes already up to 2005-03-13\n";
+       }
+}
+
+function do_text_id() {
+       global $wgDatabase;
+       if( $wgDatabase->fieldExists( 'revision', 'rev_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 );
+               echo "ok\n";
+       }
+}
+
+function do_namespace_size() {
+       $tables = array(
+               'page'          => 'page',
+               'archive'       => 'ar',
+               'recentchanges' => 'rc',
+               'watchlist'     => 'wl',
+               'querycache'    => 'qc',
+               'logging'       => 'log',
+       );
+       foreach( $tables as $table => $prefix ) {
+               do_namespace_size_on( $table, $prefix );
+               flush();
+       }
+}
+
+function do_namespace_size_on( $table, $prefix ) {
+       global $wgDatabase;
+       $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";
+       }
+}
+
 function do_all_updates() {
-       global $wgNewTables, $wgNewFields;
+       global $wgNewTables, $wgNewFields, $wgRenamedTables;
        
+       # Rename tables
+       foreach ( $wgRenamedTables as $tableRecord ) {
+               rename_table( $tableRecord[0], $tableRecord[1], $tableRecord[2] );
+       }
+
        # Add missing tables
        foreach ( $wgNewTables as $tableRecord ) {
                add_table( $tableRecord[0], $tableRecord[1] );
@@ -153,9 +522,12 @@ function do_all_updates() {
 
        # Add missing fields
        foreach ( $wgNewFields as $fieldRecord ) {
-               add_table( $fieldRecord[0], $fieldRecord[1], $fieldRecord[2] );
+               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();
@@ -163,14 +535,15 @@ function do_all_updates() {
        do_linkscc_1_3_update(); flush();
        convertLinks(); flush();
        do_image_name_unique_update(); flush();
-
-       if ( isTemplateInitialised() ) {
-               print "Template namespace already initialised\n";
-       } else {
-               moveCustomMessages( 1 ); flush();
-               moveCustomMessages( 2 ); flush();
-               moveCustomMessages( 3 ); flush();
-       }
+       do_watchlist_update(); flush();
+       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();
 
        initialiseMessages(); flush();
 }