From: Greg Sabino Mullane <greg@users.mediawiki.org>
Date: Fri, 10 Oct 2008 18:24:02 +0000 (+0000)
Subject: Quick fix to index dropping, without using IF EXISTS clause, per bug #15896
X-Git-Tag: 1.31.0-rc.0~44804
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/membres/fiche.php?a=commitdiff_plain;h=4cb78de05fd1d1e7ad40716e350d8bc3200b751a;p=lhc%2Fweb%2Fwiklou.git

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 9cfc6318c0..e618f99ccf 100644
--- 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 5fb054602e..f58fe7b71f 100644
--- 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'));
 	}