From 396b28f3d881f5debd888ba9bb9b47c2d478a76f Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Mon, 15 Dec 2008 18:02:47 +0100 Subject: update to Mediawiki 1.13.3; some cleanups --- .../postgres/archives/patch-archive-ar_deleted.sql | 1 - maintenance/postgres/archives/patch-archive2.sql | 15 - .../postgres/archives/patch-archive_delete.sql | 5 - .../postgres/archives/patch-archive_insert.sql | 6 - .../postgres/archives/patch-ipb_address_unique.sql | 2 + .../postgres/archives/patch-rev_text_id_idx.sql | 1 - maintenance/postgres/wp_mysql2postgres.pl | 400 --------------------- 7 files changed, 2 insertions(+), 428 deletions(-) delete mode 100644 maintenance/postgres/archives/patch-archive-ar_deleted.sql delete mode 100644 maintenance/postgres/archives/patch-archive2.sql delete mode 100644 maintenance/postgres/archives/patch-archive_delete.sql delete mode 100644 maintenance/postgres/archives/patch-archive_insert.sql create mode 100644 maintenance/postgres/archives/patch-ipb_address_unique.sql delete mode 100644 maintenance/postgres/archives/patch-rev_text_id_idx.sql delete mode 100644 maintenance/postgres/wp_mysql2postgres.pl (limited to 'maintenance/postgres') diff --git a/maintenance/postgres/archives/patch-archive-ar_deleted.sql b/maintenance/postgres/archives/patch-archive-ar_deleted.sql deleted file mode 100644 index 08bc1e37..00000000 --- a/maintenance/postgres/archives/patch-archive-ar_deleted.sql +++ /dev/null @@ -1 +0,0 @@ -ALTER TABLE archive ADD ar_deleted INTEGER NOT NULL DEFAULT '0'; diff --git a/maintenance/postgres/archives/patch-archive2.sql b/maintenance/postgres/archives/patch-archive2.sql deleted file mode 100644 index fa900cbf..00000000 --- a/maintenance/postgres/archives/patch-archive2.sql +++ /dev/null @@ -1,15 +0,0 @@ -ALTER TABLE archive RENAME to archive2; -CREATE VIEW archive AS -SELECT - ar_namespace, ar_title, ar_text, ar_comment, ar_user, ar_user_text, - ar_minor_edit, ar_flags, ar_rev_id, ar_text_id, - TO_CHAR(ar_timestamp, 'YYYYMMDDHH24MISS') AS ar_timestamp -FROM archive2; - -CREATE RULE archive_insert AS ON INSERT TO archive -DO INSTEAD INSERT INTO archive2 VALUES ( - NEW.ar_namespace, NEW.ar_title, NEW.ar_text, NEW.ar_comment, NEW.ar_user, NEW.ar_user_text, - TO_DATE(NEW.ar_timestamp, 'YYYYMMDDHH24MISS'), - NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id -); - diff --git a/maintenance/postgres/archives/patch-archive_delete.sql b/maintenance/postgres/archives/patch-archive_delete.sql deleted file mode 100644 index 4a864c3b..00000000 --- a/maintenance/postgres/archives/patch-archive_delete.sql +++ /dev/null @@ -1,5 +0,0 @@ -CREATE RULE archive_delete AS ON DELETE TO archive -DO INSTEAD DELETE FROM archive2 WHERE - archive2.ar_title = OLD.ar_title AND - archive2.ar_namespace = OLD.ar_namespace AND - archive2.ar_rev_id = OLD.ar_rev_id; diff --git a/maintenance/postgres/archives/patch-archive_insert.sql b/maintenance/postgres/archives/patch-archive_insert.sql deleted file mode 100644 index ca13d2a2..00000000 --- a/maintenance/postgres/archives/patch-archive_insert.sql +++ /dev/null @@ -1,6 +0,0 @@ -CREATE OR REPLACE RULE archive_insert AS ON INSERT TO archive -DO INSTEAD INSERT INTO archive2 VALUES ( - NEW.ar_namespace, NEW.ar_title, NEW.ar_text, NEW.ar_comment, NEW.ar_user, NEW.ar_user_text, - TO_TIMESTAMP(NEW.ar_timestamp, 'YYYYMMDDHH24MISS'), - NEW.ar_minor_edit, NEW.ar_flags, NEW.ar_rev_id, NEW.ar_text_id -); diff --git a/maintenance/postgres/archives/patch-ipb_address_unique.sql b/maintenance/postgres/archives/patch-ipb_address_unique.sql new file mode 100644 index 00000000..9cfc6318 --- /dev/null +++ b/maintenance/postgres/archives/patch-ipb_address_unique.sql @@ -0,0 +1,2 @@ +DROP INDEX IF EXISTS ipb_address; +CREATE UNIQUE INDEX ipb_address_unique ON ipblocks (ipb_address,ipb_user,ipb_auto,ipb_anon_only); diff --git a/maintenance/postgres/archives/patch-rev_text_id_idx.sql b/maintenance/postgres/archives/patch-rev_text_id_idx.sql deleted file mode 100644 index 036c0be3..00000000 --- a/maintenance/postgres/archives/patch-rev_text_id_idx.sql +++ /dev/null @@ -1 +0,0 @@ -CREATE INDEX rev_text_id_idx ON revision (rev_text_id); diff --git a/maintenance/postgres/wp_mysql2postgres.pl b/maintenance/postgres/wp_mysql2postgres.pl deleted file mode 100644 index 981d99f3..00000000 --- a/maintenance/postgres/wp_mysql2postgres.pl +++ /dev/null @@ -1,400 +0,0 @@ -#!/usr/bin/perl - -## Convert data from a MySQL mediawiki database into a Postgres mediawiki database -## svn: $Id: wp_mysql2postgres.pl 18836 2007-01-05 03:37:19Z brion $ - -use strict; -use warnings; -use Data::Dumper; -use Getopt::Long; - -use vars qw(%table %tz %special @torder $COM); -my $VERSION = "1.0"; - -## The following options can be changed via command line arguments: -my $MYSQLDB = 'wikidb'; -my $MYSQLUSER = 'wikiuser'; - -## If the following are zero-length, we omit their arguments entirely: -my $MYSQLHOST = ''; -my $MYSQLPASSWORD = ''; -my $MYSQLSOCKET = ''; - -## Name of the dump file created -my $MYSQLDUMPFILE = "mediawiki_upgrade.pg"; - -## How verbose should this script be (0, 1, or 2) -my $verbose = 0; - -my $USAGE = " -Usage: $0 [OPTION]... -Convert a MediaWiki schema from MySQL to Postgres -Example: $0 --db=wikidb --user=wikiuser --pass=sushi -Options: - db Name of the MySQL database - user MySQL database username - pass MySQL database password - host MySQL database host - socket MySQL database socket - verbose Verbosity, increases with multiple uses -"; - -GetOptions - ( - "db=s" => \$MYSQLDB, - "user=s" => \$MYSQLUSER, - "pass=s" => \$MYSQLPASSWORD, - "host=s" => \$MYSQLHOST, - "socket=s" => \$MYSQLSOCKET, - "verbose+" => \$verbose - ); - -## The Postgres schema file: should not be changed -my $PG_SCHEMA = "tables.sql"; - -## What version we default to when we can't parse the old schema -my $MW_DEFAULT_VERSION = '1.8'; - -## Try and find a working version of mysqldump -$verbose and warn "Locating the mysqldump executable\n"; -my @MYSQLDUMP = ("/usr/local/bin/mysqldump", "/usr/bin/mysqldump"); -my $MYSQLDUMP; -for my $mytry (@MYSQLDUMP) { - next if ! -e $mytry; - -x $mytry or die qq{Not an executable file: "$mytry"\n}; - my $version = qx{$mytry -V}; - $version =~ /^mysqldump\s+Ver\s+\d+/ or die qq{Program at "$mytry" does not act like mysqldump\n}; - $MYSQLDUMP = $mytry; -} -$MYSQLDUMP or die qq{Could not find the mysqldump program\n}; - -## Flags we use for mysqldump -my @MYSQLDUMPARGS = qw( ---skip-lock-tables ---complete-insert ---skip-extended-insert ---skip-add-drop-table ---skip-add-locks ---skip-disable-keys ---skip-set-charset ---skip-comments ---skip-quote-names -); - - -$verbose and warn "Checking that mysqldump can handle our flags\n"; -## Make sure this version can handle all the flags we want. -## Combine with user dump below -my $MYSQLDUMPARGS = join " " => @MYSQLDUMPARGS; -## Argh. Any way to make this work on Win32? -my $version = qx{$MYSQLDUMP $MYSQLDUMPARGS 2>&1}; -if ($version =~ /unknown option/) { - die qq{Sorry, you need to use a newer version of the mysqldump program than the one at "$MYSQLDUMP"\n}; -} - -push @MYSQLDUMPARGS, "--user=$MYSQLUSER"; -length $MYSQLPASSWORD and push @MYSQLDUMPARGS, "--password=$MYSQLPASSWORD"; -length $MYSQLHOST and push @MYSQLDUMPARGS, "--host=$MYSQLHOST"; - -## Open the dump file to hold the mysqldump output -open my $mdump, "+>", $MYSQLDUMPFILE or die qq{Could not open "$MYSQLDUMPFILE": $!\n}; -$verbose and warn qq{Writing file "$MYSQLDUMPFILE"\n}; - -open my $mfork2, "-|" or exec $MYSQLDUMP, @MYSQLDUMPARGS, "--no-data", $MYSQLDB; -my $oldselect = select $mdump; - -print while <$mfork2>; - -## Slurp in the current schema -my $current_schema; -seek $mdump, 0, 0; -{ - local $/; - $current_schema = <$mdump>; -} -seek $mdump, 0, 0; -truncate $mdump, 0; - -warn qq{Trying to determine database version...\n} if $verbose; - -my $current_version = 0; -if ($current_schema =~ /CREATE TABLE \S+cur /) { - $current_version = '1.3'; -} -elsif ($current_schema =~ /CREATE TABLE \S+brokenlinks /) { - $current_version = '1.4'; -} -elsif ($current_schema !~ /CREATE TABLE \S+templatelinks /) { - $current_version = '1.5'; -} -elsif ($current_schema !~ /CREATE TABLE \S+validate /) { - $current_version = '1.6'; -} -elsif ($current_schema !~ /ipb_auto tinyint/) { - $current_version = '1.7'; -} -else { - $current_version = '1.8'; -} - -if (!$current_version) { - warn qq{WARNING! Could not figure out the old version, assuming MediaWiki $MW_DEFAULT_VERSION\n}; - $current_version = $MW_DEFAULT_VERSION; -} - -## Check for a table prefix: -my $table_prefix = ''; -if ($current_version =~ /CREATE TABLE (\S+)archive /) { - $table_prefix = $1; -} - -warn qq{Old schema is from MediaWiki version $current_version\n} if $verbose; -warn qq{Table prefix is "$table_prefix"\n} if $verbose and length $table_prefix; - -$verbose and warn qq{Writing file "$MYSQLDUMPFILE"\n}; -my $now = scalar localtime(); -my $conninfo = ''; -$MYSQLHOST and $conninfo .= "\n-- host $MYSQLHOST"; -$MYSQLSOCKET and $conninfo .= "\n-- socket $MYSQLSOCKET"; - -print qq{ --- Dump of MySQL Mediawiki tables for import into a Postgres Mediawiki schema --- Performed by the program: $0 --- Version: $VERSION (subversion }.q{$LastChangedRevision: 18836 $}.qq{) --- Author: Greg Sabino Mullane Comments welcome --- --- This file was created: $now --- Executable used: $MYSQLDUMP --- Connection information: --- database: $MYSQLDB --- user: $MYSQLUSER$conninfo - --- This file can be imported manually with psql like so: --- psql -p port# -h hostname -U username -f $MYSQLDUMPFILE databasename --- This will overwrite any existing MediaWiki information, so be careful - - -}; - -warn qq{Reading in the Postgres schema information\n} if $verbose; -open my $schema, "<", $PG_SCHEMA - or die qq{Could not open "$PG_SCHEMA": make sure this script is run from maintenance/postgres/\n}; -my $t; -while (<$schema>) { - if (/CREATE TABLE\s+(\S+)/) { - $t = $1; - $table{$t}={}; - } - elsif (/^ +(\w+)\s+TIMESTAMP/) { - $tz{$t}{$1}++; - } - elsif (/REFERENCES\s*([^( ]+)/) { - my $ref = $1; - exists $table{$ref} or die qq{No parent table $ref found for $t\n}; - $table{$t}{$ref}++; - } -} -close $schema; - -## Read in special cases and table/version information -$verbose and warn qq{Reading in schema exception information\n}; -my %version_tables; -while () { - if (/^VERSION\s+(\d+\.\d+):\s+(.+)/) { - my $list = join '|' => split /\s+/ => $2; - $version_tables{$1} = qr{\b$list\b}; - next; - } - next unless /^(\w+)\s*(.*)/; - $special{$1} = $2||''; - $special{$2} = $1 if length $2; -} - -## Determine the order of tables based on foreign key constraints -$verbose and warn qq{Figuring out order of tables to dump\n}; -my %dumped; -my $bail = 0; -{ - my $found=0; - T: for my $t (sort keys %table) { - next if exists $dumped{$t} and $dumped{$t} >= 1; - $found=1; - for my $dep (sort keys %{$table{$t}}) { - next T if ! exists $dumped{$dep} or $dumped{$dep} < 0; - } - $dumped{$t} = -1 if ! exists $dumped{$t}; - ## Skip certain tables that are not imported - next if exists $special{$t} and !$special{$t}; - push @torder, $special{$t} || $t; - } - last if !$found; - push @torder, "---"; - for (values %dumped) { $_+=2; } - die "Too many loops!\n" if $bail++ > 1000; - redo; -} - -## Prepare the Postgres database for the move -$verbose and warn qq{Writing Postgres transformation information\n}; - -print "\n-- Empty out all existing tables\n"; -$verbose and warn qq{Writing truncates to empty existing tables\n}; -for my $t (@torder) { - next if $t eq '---'; - my $tname = $special{$t}||$t; - printf qq{TRUNCATE TABLE %-18s CASCADE;\n}, qq{"$tname"}; -} -print "\n\n"; - -print qq{-- Rename the "text" table\n}; -print qq{ALTER TABLE pagecontent RENAME TO "text";\n\n}; - -print qq{-- Allow rc_ip to contain empty string, will convert at end\n}; -print qq{ALTER TABLE recentchanges ALTER rc_ip TYPE text USING host(rc_ip);\n\n}; - -print "-- Changing all timestamp fields to handle raw integers\n"; -for my $t (sort keys %tz) { - next if $t eq "archive2"; - for my $c (sort keys %{$tz{$t}}) { - printf "ALTER TABLE %-18s ALTER %-25s TYPE TEXT;\n", $t, $c; - } -} -print "\n"; - -print qq{ -INSERT INTO page VALUES (0,-1,'Dummy Page','',0,0,0,default,now(),0,10); -}; - -## If we have a table _prefix, we need to temporarily rename all of our Postgres -## tables temporarily for the import. Perhaps consider making this an auto-schema -## thing in the future. -if (length $table_prefix) { - print qq{\n\n-- Temporarily renaming tables to accomodate the table_prefix "$table_prefix"\n\n}; - for my $t (@torder) { - next if $t eq '---'; - my $tname = $special{$t}||$t; - printf qq{ALTER TABLE %-18s RENAME TO "${table_prefix}$tname"\n}, qq{"$tname"}; - } -} - - -## Try and dump the ill-named "user" table: -## We do this table alone because "user" is a reserved word. -print qq{ - -SET escape_string_warning TO 'off'; -\\o /dev/null - --- Postgres uses a table name of "mwuser" instead of "user" - --- Create a dummy user to satisfy fk contraints especially with revisions -SELECT setval('user_user_id_seq',0,'false'); -INSERT INTO mwuser - VALUES (DEFAULT,'Anonymous','',NULL,NULL,NULL,NULL,NULL,NULL,NULL,NULL,now(),now()); - -}; - -push @MYSQLDUMPARGS, "--no-create-info"; - -$verbose and warn qq{Dumping "user" table\n}; -$verbose > 2 and warn Dumper \@MYSQLDUMPARGS; -my $usertable = "${table_prefix}user"; -open my $mfork, "-|" or exec $MYSQLDUMP, @MYSQLDUMPARGS, $MYSQLDB, $usertable; -## Unfortunately, there is no easy way to catch errors -my $numusers = 0; -while (<$mfork>) { - ++$numusers and print if s/INSERT INTO $usertable/INSERT INTO mwuser/; -} -close $mfork; -if ($numusers < 1) { - warn qq{No users found, probably a connection error.\n}; - print qq{ERROR: No users found, connection failed, or table "$usertable" does not exist. Dump aborted.\n}; - close $mdump; - exit; -} -print "\n-- Users loaded: $numusers\n\n-- Loading rest of the mediawiki schema:\n"; - -warn qq{Dumping all other tables from the MySQL schema\n} if $verbose; - -## Dump the rest of the tables, in chunks based on constraints -## We do not need the user table: -my @dumplist = grep { $_ ne 'user'} @torder; -my @alist; -{ - undef @alist; - PICKATABLE: { - my $tname = shift @dumplist; - ## XXX Make this dynamic below - for my $ver (sort {$b <=> $a } keys %version_tables) { - redo PICKATABLE if $tname =~ $version_tables{$ver}; - } - $tname = "${table_prefix}$tname" if length $table_prefix; - push @alist, $tname; - pop @alist and last if index($alist[-1],'---') >= 0; - redo if @dumplist; - } - - ## Dump everything else - open my $mfork2, "-|" or exec $MYSQLDUMP, @MYSQLDUMPARGS, $MYSQLDB, @alist; - print while <$mfork2>; - close $mfork2; - warn qq{Finished dumping from MySQL\n} if $verbose; - - redo if @dumplist; -} - -warn qq{Writing information to return Postgres database to normal\n} if $verbose; -print qq{ALTER TABLE "${table_prefix}text" RENAME TO pagecontent;\n}; -print qq{ALTER TABLE ${table_prefix}recentchanges ALTER rc_ip TYPE cidr USING\n}; -print qq{ CASE WHEN rc_ip = '' THEN NULL ELSE rc_ip::cidr END;\n}; - -## Return tables to their original names if a table prefix was used. -if (length $table_prefix) { - print qq{\n\n-- Renaming tables by removing table prefix "$table_prefix"\n\n}; - my $maxsize = 18; - for (@torder) { - $maxsize = length "$_$table_prefix" if length "$_$table_prefix" > $maxsize; - } - for my $t (@torder) { - next if $t eq '---' or $t eq 'text'; - my $tname = $special{$t}||$t; - printf qq{ALTER TABLE %*s RENAME TO "$tname"\n}, $maxsize+1, qq{"${table_prefix}$tname"}; - } -} - -print qq{\n\n--Returning timestamps to normal\n}; -for my $t (sort keys %tz) { - next if $t eq "archive2"; - for my $c (sort keys %{$tz{$t}}) { - printf "ALTER TABLE %-18s ALTER %-25s TYPE timestamptz\n". - " USING TO_TIMESTAMP($c,'YYYYMMDDHHMISS');\n", $t, $c; - } -} - -## Finally, make a record in the mediawiki_version table about this import -print qq{ -INSERT INTO mediawiki_version (type,mw_version,notes) VALUES ('MySQL import','??', -'Imported from file created on $now. Old version: $current_version'); -}; - - -print "\\o\n\n-- End of dump\n\n"; -select $oldselect; -close $mdump; -exit; - - -__DATA__ -## Known remappings: either indicate the MySQL name, -## or leave blank if it should be skipped -pagecontent text -mwuser user -mediawiki_version -archive2 -profiling -objectcache - -## Which tables to ignore depending on the version -VERSION 1.5: trackback -VERSION 1.6: externallinks job templatelinks transcache -VERSION 1.7: filearchive langlinks querycache_info -- cgit v1.2.3-54-g00ecf