array( 'user', 'user_token', 'patch-user_token.sql' ),
array( 'user_rights', 'ur_user', 'patch-rename-user_groups-and_rights.sql' ),
array( 'group', 'group_rights', 'patch-userlevels-rights.sql' ),
+ array( 'logging', 'log_params', 'patch-log_params.sql' ),
);
function add_table( $name, $patch ) {
global $wgDatabase;
global $wgCommandLineMode; # this needs to be saved while getID() and getName() are called
- $CommandLineMode_save = $wgCommandLineMode;
- $wgCommandLineMode = false; # otherwise User:loadfromDatabase() early returns, but we need it herein
-
if ( $wgDatabase->tableExists( 'user_newtalk' ) ) {
$res = $wgDatabase->safeQuery( 'SELECT user_id, user_ip FROM !',
$wgDatabase->tableName( 'user_newtalk' ) );
} else {
echo "ENOTIF: No user_newtalk table found. Nothing to convert to watchlist table entries.\n";
}
- $wgCommandLineMode = $CommandLineMode_save;
}
$row = $wgDatabase->fetchObject( $res );
$wgDatabase->freeResult( $res );
if( $row->n ) {
- echo "Fixing sysops group permissions... ";
+ echo "Fixing sysops group permissions and add group editing right... ";
dbsource( "maintenance/archives/patch-group-sysopfix.sql", $wgDatabase );
echo "ok\n";
} else {
}
}
+/**
+ * 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";
} else {
echo "...converting from cur/old to page/revision/text DB structure.\n"; flush();
echo "......checking for duplicate entries.\n"; flush();
- $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 );
+
+ 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 "......<b>Found duplicate entries</b>\n";
$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 ';
+ $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 .= ' AND ';
+ $sql .= ' OR ';
}
$sql .= "( cur_namespace = {$ns} AND cur_title in (";
$first = true;
$prev_title = $row->cur_title;
$prev_namespace = $row->cur_namespace;
}
- $sql = 'DELETE FROM cur WHERE cur_id IN ( ' . join( ',', $deleteId ) . ')';
+ $sql = "DELETE FROM $cur WHERE cur_id IN ( " . join( ',', $deleteId ) . ')';
$rows = $wgDatabase->query( $sql, $fname );
echo "......<b>Deleted</b> ".$wgDatabase->affectedRows()." records.\n";
}
echo "......Creating tables.\n";
- $wgDatabase->query(" CREATE TABLE page (
+ $wgDatabase->query(" CREATE TABLE $page (
page_id int(8) unsigned NOT NULL auto_increment,
page_namespace tinyint NOT NULL,
page_title varchar(255) binary NOT NULL,
UNIQUE INDEX name_title (page_namespace,page_title),
INDEX (page_random)
)", $fname );
- $wgDatabase->query("CREATE TABLE revision (
+ $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_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',
- inverse_timestamp char(14) binary NOT NULL default '',
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,inverse_timestamp),
- INDEX user_timestamp (rev_user,inverse_timestamp),
- INDEX usertext_timestamp (rev_user_text,inverse_timestamp)
+ INDEX page_timestamp (rev_page,rev_timestamp),
+ INDEX user_timestamp (rev_user,rev_timestamp),
+ INDEX usertext_timestamp (rev_user_text,rev_timestamp)
)", $fname );
echo "......Locking tables.\n";
- $wgDatabase->query( 'LOCK TABLES page WRITE, revision WRITE, old WRITE, cur WRITE', $fname );
+ $wgDatabase->query( "LOCK TABLES $page WRITE, $revision WRITE, $old WRITE, $cur WRITE", $fname );
$maxold = $wgDatabase->selectField( 'old', 'max(old_id)', '', $fname );
echo "......maxold is {$maxold}\n";
echo "......Moving text from cur.\n";
- $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, inverse_timestamp)
- SELECT cur_namespace, cur_title, cur_text, cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit,
- '', inverse_timestamp
- FROM cur", $fname );
+ $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, rev_timestamp)
+ SELECT cur_namespace, cur_title, cur_text, cur_comment, cur_user, cur_user_text, cur_timestamp, cur_minor_edit,''
+ FROM $cur", $fname );
echo "......Setting up revision table.\n";
- $wgDatabase->query( "INSERT INTO revision (rev_id, rev_page, rev_comment, rev_user, rev_user_text, rev_timestamp,
- inverse_timestamp, rev_minor_edit)
+ $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.inverse_timestamp, old_minor_edit
- FROM old,cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
+ old_timestamp, old_minor_edit
+ FROM $old,$cur WHERE old_namespace=cur_namespace AND old_title=cur_title", $fname );
echo "......Setting up page table.\n";
- $wgDatabase->query( "INSERT INTO page (page_id, page_namespace, page_title, page_restrictions, page_counter,
+ $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)
SELECT cur_id, cur_namespace, cur_title, cur_restrictions, cur_counter, cur_is_redirect, cur_is_new,
cur_random, cur_touched, rev_id
- FROM cur,revision
+ FROM $cur,$revision
WHERE cur_id=rev_page AND rev_timestamp=cur_timestamp AND rev_id > {$maxold}", $fname );
echo "......Unlocking tables.\n";
$wgDatabase->query( "UNLOCK TABLES", $fname );
echo "......Renaming old.\n";
- $wgDatabase->query( "ALTER TABLE old RENAME TO text", $fname );
+ $wgDatabase->query( "ALTER TABLE $old RENAME TO $text", $fname );
echo "...done.\n";
}
}
convertLinks(); flush();
do_image_name_unique_update(); flush();
do_watchlist_update(); flush();
- do_copy_newtalk_to_watchlist(); flush();
do_user_update(); flush();
-
+ do_copy_newtalk_to_watchlist(); flush();
+ do_logging_encoding(); flush();
+
do_schema_restructuring(); flush();
if ( isTemplateInitialised() ) {
dépôts / lhc / web / wiklou.git / blobdiff