From 9db190c7e736ec8d063187d4241b59feaf7dc2d1 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Wed, 22 Jun 2011 11:28:20 +0200 Subject: update to MediaWiki 1.17.0 --- maintenance/sqlite/README | 12 ------------ maintenance/sqlite/archives/initial-indexes.sql | 2 +- .../archives/patch-categorylinks-better-collation.sql | 7 +++++++ .../sqlite/archives/patch-iw_api_and_wikiid.sql | 19 +++++++++++++++++++ maintenance/sqlite/archives/patch-kill-iwl_pft.sql | 7 +++++++ maintenance/sqlite/archives/patch-kill-iwl_prefix.sql | 7 +++++++ .../sqlite/archives/patch-log_search-rename-index.sql | 1 + .../sqlite/archives/patch-rename-iwl_prefix.sql | 5 +++++ maintenance/sqlite/archives/patch-tc-timestamp.sql | 2 +- maintenance/sqlite/archives/searchindex-fts3.sql | 2 +- 10 files changed, 49 insertions(+), 15 deletions(-) delete mode 100644 maintenance/sqlite/README create mode 100644 maintenance/sqlite/archives/patch-categorylinks-better-collation.sql create mode 100644 maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql create mode 100644 maintenance/sqlite/archives/patch-kill-iwl_pft.sql create mode 100644 maintenance/sqlite/archives/patch-kill-iwl_prefix.sql create mode 100644 maintenance/sqlite/archives/patch-log_search-rename-index.sql create mode 100644 maintenance/sqlite/archives/patch-rename-iwl_prefix.sql (limited to 'maintenance/sqlite') diff --git a/maintenance/sqlite/README b/maintenance/sqlite/README deleted file mode 100644 index b8a45553..00000000 --- a/maintenance/sqlite/README +++ /dev/null @@ -1,12 +0,0 @@ -SQLite shares the MySQL schema file at maintenance/tables.sql, with a set of -compatibility regexes to convert MySQL syntax to SQLite syntax: - -* BINARY() and VARBINARY() fields are converted to BLOB -* the UNSIGNED modifier is removed -* "INT" fields are converted to "INTEGER" -* ENUM is converted to BLOB -* the BINARY collation modifier is removed -* AUTO_INCREMENT is converted to AUTOINCREMENT -* Any table options are removed -* Truncated indexes are upgraded to full-width indexes -* FULLTEXT indexes are converted to ordinary indexes diff --git a/maintenance/sqlite/archives/initial-indexes.sql b/maintenance/sqlite/archives/initial-indexes.sql index f0851163..2573ca13 100644 --- a/maintenance/sqlite/archives/initial-indexes.sql +++ b/maintenance/sqlite/archives/initial-indexes.sql @@ -413,4 +413,4 @@ CREATE INDEX /*i*/qcc_type ON /*_*/querycachetwo (qcc_type,qcc_value); CREATE INDEX /*i*/qcc_title ON /*_*/querycachetwo (qcc_type,qcc_namespace,qcc_title); CREATE INDEX /*i*/qcc_titletwo ON /*_*/querycachetwo (qcc_type,qcc_namespacetwo,qcc_titletwo); -INSERT INTO /*_*/updatelog VALUES ('initial_indexes'); +INSERT INTO /*_*/updatelog (ul_key) VALUES ('initial_indexes'); diff --git a/maintenance/sqlite/archives/patch-categorylinks-better-collation.sql b/maintenance/sqlite/archives/patch-categorylinks-better-collation.sql new file mode 100644 index 00000000..f32af134 --- /dev/null +++ b/maintenance/sqlite/archives/patch-categorylinks-better-collation.sql @@ -0,0 +1,7 @@ +ALTER TABLE /*_*/categorylinks ADD COLUMN cl_sortkey_prefix TEXT NOT NULL default ''; +ALTER TABLE /*_*/categorylinks ADD COLUMN cl_collation BLOB NOT NULL default ''; +ALTER TABLE /*_*/categorylinks ADD COLUMN cl_type TEXT NOT NULL default 'page'; +CREATE INDEX cl_collation ON /*_*/categorylinks (cl_collation); +DROP INDEX cl_sortkey; +CREATE INDEX cl_sortkey ON /*_*/categorylinks (cl_to, cl_type, cl_sortkey, cl_from); +INSERT OR IGNORE INTO /*_*/updatelog (ul_key) VALUES ('cl_fields_update'); diff --git a/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql b/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql new file mode 100644 index 00000000..f9172b5e --- /dev/null +++ b/maintenance/sqlite/archives/patch-iw_api_and_wikiid.sql @@ -0,0 +1,19 @@ +-- +-- Add iw_api and iw_wikiid to interwiki table +-- + + +CREATE TABLE /*_*/interwiki_tmp ( + iw_prefix TEXT NOT NULL, + iw_url BLOB NOT NULL, + iw_api BLOB NOT NULL, + iw_wikiid TEXT NOT NULL, + iw_local INTEGER NOT NULL, + iw_trans INTEGER NOT NULL default 0 +) /*$wgDBTableOptions*/; + +INSERT INTO /*_*/interwiki_tmp SELECT iw_prefix, iw_url, '', '', iw_local, iw_trans FROM /*_*/interwiki; +DROP TABLE /*_*/interwiki; +ALTER TABLE /*_*/interwiki_tmp RENAME TO /*_*/interwiki; + +CREATE UNIQUE INDEX /*i*/iw_prefix ON /*_*/interwiki (iw_prefix); \ No newline at end of file diff --git a/maintenance/sqlite/archives/patch-kill-iwl_pft.sql b/maintenance/sqlite/archives/patch-kill-iwl_pft.sql new file mode 100644 index 00000000..8fc4b5cd --- /dev/null +++ b/maintenance/sqlite/archives/patch-kill-iwl_pft.sql @@ -0,0 +1,7 @@ +-- +-- Kill the old iwl_prefix_from_title index, which may be present on some +-- installs if they ran update.php between it being added and being renamed +-- + +DROP INDEX IF EXISTS /*i*/iwl_prefix; + diff --git a/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql b/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql new file mode 100644 index 00000000..78ed385e --- /dev/null +++ b/maintenance/sqlite/archives/patch-kill-iwl_prefix.sql @@ -0,0 +1,7 @@ +-- +-- Kill the old iwl_prefix index, which may be present on some +-- installs if they ran update.php between it being added and being renamed +-- + +DROP INDEX IF EXISTS /*i*/iwl_prefix; + diff --git a/maintenance/sqlite/archives/patch-log_search-rename-index.sql b/maintenance/sqlite/archives/patch-log_search-rename-index.sql new file mode 100644 index 00000000..4b98a0f2 --- /dev/null +++ b/maintenance/sqlite/archives/patch-log_search-rename-index.sql @@ -0,0 +1 @@ +CREATE UNIQUE INDEX ls_field_val ON /*_*/log_search (ls_field,ls_value,ls_log_id); diff --git a/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql b/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql new file mode 100644 index 00000000..08c3ae5f --- /dev/null +++ b/maintenance/sqlite/archives/patch-rename-iwl_prefix.sql @@ -0,0 +1,5 @@ +-- +-- Recreates the iwl_prefix for the iwlinks table +-- +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 diff --git a/maintenance/sqlite/archives/patch-tc-timestamp.sql b/maintenance/sqlite/archives/patch-tc-timestamp.sql index 551a5f1c..5c09bf35 100644 --- a/maintenance/sqlite/archives/patch-tc-timestamp.sql +++ b/maintenance/sqlite/archives/patch-tc-timestamp.sql @@ -1,3 +1,3 @@ UPDATE /*_*/transcache SET tc_time = strftime('%Y%m%d%H%M%S', datetime(tc_time, 'unixepoch')); -INSERT INTO /*_*/updatelog VALUES ('convert transcache field'); +INSERT INTO /*_*/updatelog (ul_key) VALUES ('convert transcache field'); diff --git a/maintenance/sqlite/archives/searchindex-fts3.sql b/maintenance/sqlite/archives/searchindex-fts3.sql index c3a86894..28554c02 100644 --- a/maintenance/sqlite/archives/searchindex-fts3.sql +++ b/maintenance/sqlite/archives/searchindex-fts3.sql @@ -15,4 +15,4 @@ CREATE VIRTUAL TABLE /*_*/searchindex USING FTS3( si_text ); -INSERT INTO /*_*/updatelog VALUES ('fts3'); \ No newline at end of file +INSERT INTO /*_*/updatelog (ul_key) VALUES ('fts3'); \ No newline at end of file -- cgit v1.2.2