From d001e72b52c22ba9877d4b4e593bc2c5ee2bddad Mon Sep 17 00:00:00 2001 From: Brad Jorsch Date: Mon, 26 Mar 2018 12:14:50 -0400 Subject: [PATCH] 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 --- includes/installer/PostgresUpdater.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) 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 . "\"" ); -- 2.20.1