SQLite: sync a couple of indexes with MySQL

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 5303ff4..b09d98f 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -52,6 +52,8 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'doCollationUpdate' ),
                        array( 'addTable', 'msg_resource',                      'patch-msg_resource.sql' ),
                        array( 'addTable', 'module_deps',                       'patch-module_deps.sql' ),
+                       array( 'dropIndex', 'archive', 'ar_page_revid',         'patch-archive_kill_ar_page_revid.sql' ),
+               array( 'addIndex', 'archive', 'ar_revid',               'patch-archive_ar_revid.sql' ),
 
                        // 1.19
                        array( 'addTable', 'config', 'patch-config.sql' ),

diff --git a/maintenance/archives/patch-archive_ar_revid.sql b/maintenance/archives/patch-archive_ar_revid.sql
index 67ee97b..3b3fdee 100644 (file)
--- a/maintenance/archives/patch-archive_ar_revid.sql
+++ b/maintenance/archives/patch-archive_ar_revid.sql
@@ -1,4 +1,3 @@
 -- Hopefully temporary index.
 -- For https://bugzilla.wikimedia.org/show_bug.cgi?id=21279
-ALTER TABLE /*$wgDBprefix*/archive
-       ADD INDEX ar_revid ( ar_rev_id );
\ No newline at end of file
+CREATE INDEX /*i*/ar_revid ON /*$wgDBprefix*/archive ( ar_rev_id );
\ No newline at end of file

diff --git a/maintenance/sqlite/archives/patch-archive_kill_ar_page_revid.sql b/maintenance/sqlite/archives/patch-archive_kill_ar_page_revid.sql
new file mode 100644 (file)
index 0000000..860b01b
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-archive_kill_ar_page_revid.sql
@@ -0,0 +1,3 @@
+-- Used for killing the wrong index added during SVN for 1.17\r
+-- Won't affect most people, but it doesn't need to exist\r
+DROP INDEX IF EXISTS ar_page_revid;
\ No newline at end of file