From bdb4f7436082c25fa1fbfdace6fae8adb09e66f2 Mon Sep 17 00:00:00 2001 From: OverlordQ Date: Wed, 21 Oct 2009 02:46:39 +0000 Subject: [PATCH] Add missing columns to PG schemas Add exceptions to schema comparison script Alter SQL comments to appease said script --- maintenance/postgres/compare_schemas.pl | 6 +++++- maintenance/postgres/tables.sql | 13 ++++++++++-- maintenance/tables.sql | 27 ++++++++++++++++--------- 3 files changed, 34 insertions(+), 12 deletions(-) diff --git a/maintenance/postgres/compare_schemas.pl b/maintenance/postgres/compare_schemas.pl index 0a025bdcb4..210199e853 100644 --- a/maintenance/postgres/compare_schemas.pl +++ b/maintenance/postgres/compare_schemas.pl @@ -307,7 +307,8 @@ ar_comment tinyblob TEXT fa_description tinyblob TEXT img_description tinyblob TEXT ipb_reason tinyblob TEXT -log_action varbinary(10) TEXT +log_action varbinary(32) TEXT +log_type varbinary(32) TEXT oi_description tinyblob TEXT rev_comment tinyblob TEXT rc_log_action varbinary(255) TEXT @@ -323,6 +324,9 @@ ipb_address tinyblob TEXT # IP address or username ipb_range_end tinyblob TEXT # hexadecimal ipb_range_start tinyblob TEXT # hexadecimal img_minor_mime varbinary(32) TEXT +lc_lang varbinary(32) TEXT +lc_value varbinary(32) TEXT + img_sha1 varbinary(32) TEXT job_cmd varbinary(60) TEXT # Should we limit to 60 as well? keyname varbinary(255) TEXT # No tablename prefix (objectcache) diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 87055f9ca0..dddd5830db 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -155,7 +155,9 @@ CREATE INDEX archive_user_text ON archive (ar_user_text); CREATE TABLE redirect ( rd_from INTEGER NOT NULL REFERENCES page(page_id) ON DELETE CASCADE, rd_namespace SMALLINT NOT NULL, - rd_title TEXT NOT NULL + rd_title TEXT NOT NULL, + rd_interwiki TEXT NULL, + rd_fragment TEXT NULL ); CREATE INDEX redirect_ns_title ON redirect (rd_namespace,rd_title,rd_from); @@ -198,6 +200,13 @@ CREATE TABLE externallinks ( CREATE INDEX externallinks_from_to ON externallinks (el_from,el_to); CREATE INDEX externallinks_index ON externallinks (el_index); +CREATE TABLE external_user ( + eu_wiki_id INTEGER NOT NULL PRIMARY KEY, + eu_external_id TEXT +); + +CREATE UNIQUE INDEX eu_external_id ON external_user (eu_external_id); + CREATE TABLE langlinks ( ll_from INTEGER NOT NULL REFERENCES page (page_id) ON DELETE CASCADE, ll_lang TEXT, @@ -624,6 +633,6 @@ INSERT INTO mediawiki_version (type,mw_version,sql_version,sql_date) CREATE TABLE l10n_cache ( lc_lang TEXT NOT NULL, lc_key TEXT NOT NULL, - lc_value TEXT NOT NULL + lc_value BYTEA NOT NULL ); CREATE INDEX l10n_cache_lc_lang_key ON l10n_cache (lc_lang, lc_key); diff --git a/maintenance/tables.sql b/maintenance/tables.sql index 314dcbb919..37d6c9d3e8 100644 --- a/maintenance/tables.sql +++ b/maintenance/tables.sql @@ -1298,11 +1298,16 @@ CREATE TABLE /*_*/updatelog ( -- A table to track tags for revisions, logs and recent changes. CREATE TABLE /*_*/change_tag ( - ct_rc_id int NULL, -- RCID for the change - ct_log_id int NULL, -- LOGID for the change - ct_rev_id int NULL, -- REVID for the change - ct_tag varchar(255) NOT NULL, -- Tag applied - ct_params blob NULL -- Parameters for the tag, presently unused. + -- RCID for the change + ct_rc_id int NULL, + -- LOGID for the change + ct_log_id int NULL, + -- REVID for the change + ct_rev_id int NULL, + -- Tag applied + ct_tag varchar(255) NOT NULL, + -- Parameters for the tag, presently unused + ct_params blob NULL ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/change_tag_rc_tag ON /*_*/change_tag (ct_rc_id,ct_tag); @@ -1315,10 +1320,14 @@ CREATE INDEX /*i*/change_tag_tag_id ON /*_*/change_tag (ct_tag,ct_rc_id,ct_rev_i -- Rollup table to pull a LIST of tags simply without ugly GROUP_CONCAT -- that only works on MySQL 4.1+ CREATE TABLE /*_*/tag_summary ( - ts_rc_id int NULL, -- RCID for the change - ts_log_id int NULL, -- LOGID for the change - ts_rev_id int NULL, -- REVID for the change - ts_tags blob NOT NULL -- Comma-separated list of tags. + -- RCID for the change + ts_rc_id int NULL, + -- LOGID for the change + ts_log_id int NULL, + -- REVID for the change + ts_rev_id int NULL, + -- Comma-separated list of tags + ts_tags blob NOT NULL ) /*$wgDBTableOptions*/; CREATE UNIQUE INDEX /*i*/tag_summary_rc_id ON /*_*/tag_summary (ts_rc_id); -- 2.20.1