From: Brad Jorsch <bjorsch@wikimedia.org>
Date: Mon, 26 Mar 2018 16:14:50 +0000 (-0400)
Subject: PostgresUpdater: Rename custom "dropIndex" to "dropPgIndex"
X-Git-Tag: 1.31.0-rc.0~289^2
X-Git-Url: http://git.cyclocoop.org/data/%7B%7B%20url_for%28%27static%27%2C%20filename=%27js/%40%20%27info_articles_miens%27%20=%3E%20%27My%20articles%27%2C%20%27info_articles_tous%27%20=%3E%20%27All%20the%20articles%27%2C%20%27info_articles_trouves%27%20=%3E%20%27Articles%20found%27%2C-%27info_articles_trouves_dans_texte%27%20=%3E%20%27Articles%20found%20%28in%20the%20text%29%27%2C%20%27info_attente_validation%27%20=%3E%20%27Your%20articles%20awaiting%20validation%27%2C%20%27info_aucun_article%27%20=%3E%20%27No%20articles%27%2C-%27info_aucun_article_syndique%27%20=%3E%20%27No%20syndicated%20articles%27%2C%20%27info_aucun_auteur%27%20=%3E%20%27No%20authors%27%2C%20%27info_aucun_message%27%20=%3E%20%27No%20messages%27%2C%20%27info_aucun_rubrique%27%20=%3E%20%27No%20sections%27%2C-%27info_aucun_site%27%20=%3E%20%27No%20linked%20sites%27%2C-%27info_aucun_visiteur%27%20=%3E%20%27No%20visitors%27%2C%20%27info_aujourdhui%27%20=%3E%20%27today:%27%2C-%27info_auteur_message%27%20=%3E%20%27MESSAGE%20FROM:%27%2C%20%27info_auteurs%27%20=%3E%20%27Authors%27%2C%20%27info_auteurs_par_tri%27%20=%3E%20%27Authors%40partri%40%27%2C%20%27info_auteurs_trouves%27%20=%3E%20%27Authors%20found%27%2C%40%40%20-298%2C8%20%20254%2C6%20%40%40%20Do%20not%20submit%20this%20import%20request.%3Cp%3EFor%20more%20information%2C%20please%20see%20%3Ca%20href=?a=commitdiff_plain;h=d001e72b52c22ba9877d4b4e593bc2c5ee2bddad;p=lhc%2Fweb%2Fwiklou.git

PostgresUpdater: Rename custom "dropIndex" to "dropPgIndex"

There doesn't seem to be any reason this shouldn't follow the naming
conventions of other PG-specific schema change functions, and Ie9dbda329
shows that difference can be confusing.

Change-Id: Ie3e0d5b130486aa9ab5eebd879dca846dfa99584
---

diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php
index 48f47f5f61..ba6e9683e3 100644
--- a/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@ -294,7 +294,7 @@ class PostgresUpdater extends DatabaseUpdater {
 				[ 'log_timestamp', 'timestamptz_ops', 'btree', 0 ],
 			],
 			'CREATE INDEX "logging_times" ON "logging" USING "btree" ("log_timestamp")' ],
-			[ 'dropIndex', 'oldimage', 'oi_name' ],
+			[ 'dropPgIndex', 'oldimage', 'oi_name' ],
 			[ 'checkIndex', 'oi_name_archive_name', [
 				[ 'oi_name', 'text_ops', 'btree', 0 ],
 				[ 'oi_archive_name', 'text_ops', 'btree', 0 ],
@@ -353,7 +353,7 @@ class PostgresUpdater extends DatabaseUpdater {
 			[ 'checkOiNameConstraint' ],
 			[ 'checkPageDeletedTrigger' ],
 			[ 'checkRevUserFkey' ],
-			[ 'dropIndex', 'ipblocks', 'ipb_address' ],
+			[ 'dropPgIndex', 'ipblocks', 'ipb_address' ],
 			[ 'checkIndex', 'ipb_address_unique', [
 				[ 'ipb_address', 'text_ops', 'btree', 0 ],
 				[ 'ipb_user', 'int4_ops', 'btree', 0 ],
@@ -1060,7 +1060,7 @@ END;
 		}
 	}
 
-	protected function dropIndex( $table, $index, $patch = '', $fullpath = false ) {
+	protected function dropPgIndex( $table, $index ) {
 		if ( $this->db->indexExists( $table, $index ) ) {
 			$this->output( "Dropping obsolete index '$index'\n" );
 			$this->db->query( "DROP INDEX \"" . $index . "\"" );