Quick fix to index dropping, without using IF EXISTS clause, per bug #15896

diff --git a/maintenance/postgres/archives/patch-ipb_address_unique.sql b/maintenance/postgres/archives/patch-ipb_address_unique.sql
index 9cfc631..e618f99 100644 (file)
--- a/maintenance/postgres/archives/patch-ipb_address_unique.sql
+++ b/maintenance/postgres/archives/patch-ipb_address_unique.sql
@@ -1,2 +1 @@
-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/updaters.inc b/maintenance/updaters.inc
index 5fb0546..f58fe7b 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1703,9 +1703,14 @@ function do_postgres_updates() {
        }
 
        # Fix ipb_address index
+       if (pg_index_exists('ipblocks', 'ipb_address' )) {
+               echo "Removing deprecated index 'ipb_address'...\n";
+               $wgDatabase->query('DROP INDEX ipb_address');
+       }
        if (pg_index_exists('ipblocks', 'ipb_address_unique' )) {
                echo "... have ipb_address_unique\n";
-       } else {
+       }
+       else {
                echo "Adding ipb_address_unique index\n";
                dbsource(archive('patch-ipb_address_unique.sql'));
        }