From 00745268571411eaa83ba58c614e91dd5a3d1bea Mon Sep 17 00:00:00 2001 From: OverlordQ Date: Wed, 16 Nov 2011 19:54:38 +0000 Subject: [PATCH] Followup to r100640, use correct name scheme for sequence, correct references to sequence and add optional patch file for sites following trunk --- includes/installer/PostgresUpdater.php | 1 + maintenance/postgres/archives/patch-uploadstash.sql | 4 ++-- maintenance/postgres/tables.sql | 4 ++-- 3 files changed, 5 insertions(+), 4 deletions(-) diff --git a/includes/installer/PostgresUpdater.php b/includes/installer/PostgresUpdater.php index aec0a9e5d7..ae96e488d7 100644 --- a/includes/installer/PostgresUpdater.php +++ b/includes/installer/PostgresUpdater.php @@ -33,6 +33,7 @@ class PostgresUpdater extends DatabaseUpdater { array( 'renameSequence', 'rc_rc_id_seq', 'recentchanges_rc_id_seq' ), array( 'renameSequence', 'log_log_id_seq', 'logging_log_id_seq' ), array( 'renameSequence', 'pr_id_val', 'page_restrictions_pr_id_seq' ), + array( 'renameSequence', 'us_id_seq', 'uploadstash_us_id_seq' ), # new tables array( 'addTable', 'category', 'patch-category.sql' ), diff --git a/maintenance/postgres/archives/patch-uploadstash.sql b/maintenance/postgres/archives/patch-uploadstash.sql index af7fea74b9..8fd9fb99e8 100644 --- a/maintenance/postgres/archives/patch-uploadstash.sql +++ b/maintenance/postgres/archives/patch-uploadstash.sql @@ -1,8 +1,8 @@ -CREATE SEQUENCE us_id_seq; +CREATE SEQUENCE uploadstash_us_id_seq; CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE'); CREATE TABLE uploadstash ( - us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('us_id_seq'), + us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'), us_user INTEGER, us_key TEXT, us_orig_path TEXT, diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql index 636681cff8..0d7e961741 100644 --- a/maintenance/postgres/tables.sql +++ b/maintenance/postgres/tables.sql @@ -360,11 +360,11 @@ CREATE INDEX fa_dupe ON filearchive (fa_storage_group, fa_storage_key); CREATE INDEX fa_notime ON filearchive (fa_deleted_timestamp); CREATE INDEX fa_nouser ON filearchive (fa_deleted_user); -CREATE SEQUENCE us_id_seq; +CREATE SEQUENCE uploadstash_us_id_seq; CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE'); CREATE TABLE uploadstash ( - us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('us_id_seq'), + us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'), us_user INTEGER, us_key TEXT, us_orig_path TEXT, -- 2.20.1