Attempt at changing postgres as per r66892

OverlordQ or someone, can you review please?

diff --git a/maintenance/postgres/archives/patch-rename-iwl_prefix.sql b/maintenance/postgres/archives/patch-rename-iwl_prefix.sql
new file mode 100644 (file)
index 0000000..ebe0abc
--- /dev/null
+++ b/maintenance/postgres/archives/patch-rename-iwl_prefix.sql
@@ -0,0 +1,2 @@
+DROP INDEX iwl_prefix;
+CREATE INDEX iwl_prefix_from_title ON iwlinks (iwl_prefix, iwl_from, iwl_title);
\ No newline at end of file

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 0f8ae56..1f6e95f 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -622,4 +622,4 @@ CREATE TABLE iwlinks (
         iwl_title TEXT NOT NULL DEFAULT ''
 );
 CREATE UNIQUE INDEX iwl_from ON iwlinks (iwl_from, iwl_prefix, iwl_title);
-CREATE INDEX iwl_prefix ON iwlinks (iwl_prefix, iwl_title);
+CREATE INDEX iwl_prefix_from_title ON iwlinks (iwl_prefix, iwl_from, iwl_title);

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 8674add..f06b71e 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1966,6 +1966,12 @@ function do_postgres_updates() {
                wfOut( "Adding ipb_address_unique index\n" );
                $wgDatabase->sourceFile( archive( 'patch-ipb_address_unique.sql' ) );
        }
+       
+       # Fix iwlinks index
+       if ( pg_index_exists( 'iwlinks', 'iwl_prefix' ) ) {
+               wfOut( "Replacing index 'iwl_prefix' with 'iwl_prefix_from_title'...\n" );
+               $wgDatabase->sourceFile( archive( 'patch-ipb_address_unique.sql' ) );
+       }
 
        global $wgExtNewTables, $wgExtPGNewFields, $wgExtPGAlteredFields, $wgExtNewIndexes;
        # Add missing extension tables