From 63601400e476c6cf43d985f3e7b9864681695ed4 Mon Sep 17 00:00:00 2001 From: Pierre Schmitz Date: Fri, 18 Jan 2013 16:46:04 +0100 Subject: Update to MediaWiki 1.20.2 this update includes: * adjusted Arch Linux skin * updated FluxBBAuthPlugin * patch for https://bugzilla.wikimedia.org/show_bug.cgi?id=44024 --- maintenance/postgres/archives/patch-add_interwiki.sql | 14 ++++++++++++++ maintenance/postgres/archives/patch-category.sql | 4 ++-- maintenance/postgres/archives/patch-external_user.sql | 6 ++++++ maintenance/postgres/archives/patch-ipb_address_unique.sql | 1 - maintenance/postgres/archives/patch-log_search.sql | 2 +- maintenance/postgres/archives/patch-module_deps.sql | 2 +- maintenance/postgres/archives/patch-msg_resource.sql | 2 +- maintenance/postgres/archives/patch-msg_resource_links.sql | 2 +- 8 files changed, 26 insertions(+), 7 deletions(-) create mode 100644 maintenance/postgres/archives/patch-add_interwiki.sql create mode 100644 maintenance/postgres/archives/patch-external_user.sql (limited to 'maintenance/postgres/archives') diff --git a/maintenance/postgres/archives/patch-add_interwiki.sql b/maintenance/postgres/archives/patch-add_interwiki.sql new file mode 100644 index 00000000..6c08af7a --- /dev/null +++ b/maintenance/postgres/archives/patch-add_interwiki.sql @@ -0,0 +1,14 @@ +DROP FUNCTION IF EXISTS add_interwiki(TEXT,INT,CHARACTER) CASCADE; +CREATE OR REPLACE FUNCTION "add_interwiki" (TEXT,INT,SMALLINT) RETURNS INT LANGUAGE SQL AS +$mw$ + INSERT INTO interwiki (iw_prefix, iw_url, iw_local) VALUES ($1,$2,$3); + SELECT 1; +$mw$; + +DROP FUNCTION IF EXISTS add_interwiki(TEXT,INT,CHARACTER) CASCADE; +CREATE OR REPLACE FUNCTION "add_interwiki" (TEXT,INT,SMALLINT) RETURNS INT LANGUAGE SQL AS +$mw$ + INSERT INTO interwiki (iw_prefix, iw_url, iw_local) VALUES ($1,$2,$3); + SELECT 1; +$mw$; + diff --git a/maintenance/postgres/archives/patch-category.sql b/maintenance/postgres/archives/patch-category.sql index 5e0d620f..266b1d00 100644 --- a/maintenance/postgres/archives/patch-category.sql +++ b/maintenance/postgres/archives/patch-category.sql @@ -1,8 +1,8 @@ -CREATE SEQUENCE category_id_seq; +CREATE SEQUENCE category_cat_id_seq; CREATE TABLE category ( - cat_id INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('category_id_seq'), + cat_id INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('category_cat_id_seq'), cat_title TEXT NOT NULL, cat_pages INTEGER NOT NULL DEFAULT 0, cat_subcats INTEGER NOT NULL DEFAULT 0, diff --git a/maintenance/postgres/archives/patch-external_user.sql b/maintenance/postgres/archives/patch-external_user.sql new file mode 100644 index 00000000..6058a706 --- /dev/null +++ b/maintenance/postgres/archives/patch-external_user.sql @@ -0,0 +1,6 @@ +CREATE TABLE external_user ( + eu_local_id INTEGER NOT NULL PRIMARY KEY, + eu_external_id TEXT +); + +CREATE UNIQUE INDEX eu_external_id ON external_user (eu_external_id); diff --git a/maintenance/postgres/archives/patch-ipb_address_unique.sql b/maintenance/postgres/archives/patch-ipb_address_unique.sql index e618f99c..e69de29b 100644 --- a/maintenance/postgres/archives/patch-ipb_address_unique.sql +++ b/maintenance/postgres/archives/patch-ipb_address_unique.sql @@ -1 +0,0 @@ -CREATE UNIQUE INDEX ipb_address_unique ON ipblocks (ipb_address,ipb_user,ipb_auto,ipb_anon_only); diff --git a/maintenance/postgres/archives/patch-log_search.sql b/maintenance/postgres/archives/patch-log_search.sql index 20a61fd7..4c0b3c61 100644 --- a/maintenance/postgres/archives/patch-log_search.sql +++ b/maintenance/postgres/archives/patch-log_search.sql @@ -5,5 +5,5 @@ CREATE TABLE log_search ( ls_log_id INTEGER NOT NULL DEFAULT 0 ); -ALTER TABLE log_search ADD CONSTRAINT log_search_pk PRIMARY KEY(ls_field, ls_value, ls_log_id); +ALTER TABLE log_search ADD CONSTRAINT log_search_pkey PRIMARY KEY(ls_field, ls_value, ls_log_id); CREATE INDEX ls_log_id ON log_search (ls_log_id); diff --git a/maintenance/postgres/archives/patch-module_deps.sql b/maintenance/postgres/archives/patch-module_deps.sql index 703dcdaf..bd7bb1f0 100644 --- a/maintenance/postgres/archives/patch-module_deps.sql +++ b/maintenance/postgres/archives/patch-module_deps.sql @@ -4,4 +4,4 @@ CREATE TABLE module_deps ( md_deps TEXT NOT NULL ); -CREATE UNIQUE INDEX md_module_skin_idx ON module_deps (md_module, md_skin); +CREATE UNIQUE INDEX md_module_skin ON module_deps (md_module, md_skin); diff --git a/maintenance/postgres/archives/patch-msg_resource.sql b/maintenance/postgres/archives/patch-msg_resource.sql index 00d82073..68756d1a 100644 --- a/maintenance/postgres/archives/patch-msg_resource.sql +++ b/maintenance/postgres/archives/patch-msg_resource.sql @@ -5,4 +5,4 @@ CREATE TABLE msg_resource ( mr_timestamp TIMESTAMPTZ NOT NULL ); -CREATE UNIQUE INDEX mr_resource_lang_idx ON msg_resource (mr_resource, mr_lang); +CREATE UNIQUE INDEX mr_resource_lang ON msg_resource (mr_resource, mr_lang); diff --git a/maintenance/postgres/archives/patch-msg_resource_links.sql b/maintenance/postgres/archives/patch-msg_resource_links.sql index e7b80219..88109da3 100644 --- a/maintenance/postgres/archives/patch-msg_resource_links.sql +++ b/maintenance/postgres/archives/patch-msg_resource_links.sql @@ -3,4 +3,4 @@ CREATE TABLE msg_resource_links ( mrl_message TEXT NOT NULL ); -CREATE UNIQUE INDEX mrl_message_resource_idx ON msg_resource_links (mrl_message, mrl_resource); +CREATE UNIQUE INDEX mrl_message_resource ON msg_resource_links (mrl_message, mrl_resource); -- cgit v1.2.2