diff options
Diffstat (limited to 'maintenance')
-rw-r--r-- | maintenance/postgres/tables.sql | 5 | ||||
-rw-r--r-- | maintenance/updaters.inc | 10 |
2 files changed, 11 insertions, 4 deletions
diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 083af727..2f96c052 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -240,9 +240,8 @@ CREATE TABLE ipblocks ( ipb_range_end TEXT, ipb_deleted SMALLINT NOT NULL DEFAULT 0, ipb_block_email SMALLINT NOT NULL DEFAULT 0 - ); -CREATE INDEX ipb_address ON ipblocks (ipb_address); +CREATE UNIQUE INDEX ipb_address_unique ON ipblocks (ipb_address,ipb_user,ipb_auto,ipb_anon_only); CREATE INDEX ipb_user ON ipblocks (ipb_user); CREATE INDEX ipb_range ON ipblocks (ipb_range_start,ipb_range_end); @@ -569,5 +568,5 @@ CREATE TABLE mediawiki_version ( ); INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date) - VALUES ('Creation','??','$LastChangedRevision: 37542 $','$LastChangedDate: 2008-07-11 08:11:11 +1000 (Fri, 11 Jul 2008) $'); + VALUES ('Creation','??','$LastChangedRevision: 40517 $','$LastChangedDate: 2008-09-06 17:14:20 +1000 (Sat, 06 Sep 2008) $'); diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc index 67680c49..42ef7b68 100644 --- a/maintenance/updaters.inc +++ b/maintenance/updaters.inc @@ -1663,7 +1663,7 @@ function do_postgres_updates() { $wgDatabase->query("CREATE UNIQUE INDEX pagelink_unique ON pagelinks (pl_from,pl_namespace,pl_title)"); } else - echo "... index \"pagelink_unique_index\" aready exists\n"; + echo "... index \"pagelink_unique_index\" already exists\n"; if (pg_fkey_deltype("revision_rev_user_fkey") == 'r') { echo "... constraint \"revision_rev_user_fkey\" is ON DELETE RESTRICT\n"; @@ -1673,6 +1673,14 @@ function do_postgres_updates() { dbsource(archive('patch-revision_rev_user_fkey.sql')); } + # Fix ipb_address index + if (pg_index_exists('ipblocks', 'ipb_address_unique' )) { + echo "... have ipb_address_unique\n"; + } else { + echo "Adding ipb_address_unique index\n"; + dbsource(archive('patch-ipb_address_unique.sql')); + } + global $wgExtNewTables, $wgExtPGNewFields, $wgExtNewIndexes; # Add missing extension tables foreach ( $wgExtNewTables as $nt ) { |