A few index-related fixes in SQLite DB patches, ping r66920.

The need to drop index patch-rename-iwl_prefix.sql arose from development versions that had discrepancies between tables.sql and updater. Let's just DROP IF EXISTS it.

diff --git a/maintenance/sqlite/archives/patch-kill-iwl_pft.sql b/maintenance/sqlite/archives/patch-kill-iwl_pft.sql
index 96e1435..b2eca40 100644 (file)
--- a/maintenance/sqlite/archives/patch-kill-iwl_pft.sql
+++ b/maintenance/sqlite/archives/patch-kill-iwl_pft.sql
@@ -3,5 +3,5 @@
 -- installs if they ran update.php between it being added and being renamed
 --
 
-DROP INDEX /*i*/iwl_prefix_from_title ON /*_*/iwlinks;
+DROP INDEX /*i*/iwl_prefix_from_title;
 

diff --git a/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql b/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql
index 1cd9b45..c57b7e6 100644 (file)
--- a/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql
+++ b/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql
@@ -3,5 +3,5 @@
 -- installs if they ran update.php between it being added and being renamed
 --
 
-DROP INDEX /*i*/iwl_prefix ON /*_*/iwlinks;
+DROP INDEX /*i*/iwl_prefix;
 

diff --git a/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql b/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql
index 0d68b0f..08c3ae5 100644 (file)
--- a/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql
+++ b/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql
@@ -1,5 +1,5 @@
 -- 
 -- Recreates the iwl_prefix for the iwlinks table
 --
-DROP INDEX /*i*/iwl_prefix;
+DROP INDEX IF EXISTS /*i*/iwl_prefix;
 CREATE INDEX /*i*/iwl_prefix_from_title ON /*_*/iwlinks (iwl_prefix, iwl_from, iwl_title);
\ No newline at end of file