https://www.mediawiki.org/wiki/Special:Code/MediaWiki/103365

Revision: 103365
Author:   overlordq
Date:     2011-11-16 19:54:38 +0000 (Wed, 16 Nov 2011)
Log Message:
-----------
Followup to r100640, use correct name scheme for sequence, correct references 
to sequence and add optional patch file for sites following trunk

Modified Paths:
--------------
    trunk/phase3/includes/installer/PostgresUpdater.php
    trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql
    trunk/phase3/maintenance/postgres/tables.sql

Modified: trunk/phase3/includes/installer/PostgresUpdater.php
===================================================================
--- trunk/phase3/includes/installer/PostgresUpdater.php 2011-11-16 19:51:36 UTC 
(rev 103364)
+++ trunk/phase3/includes/installer/PostgresUpdater.php 2011-11-16 19:54:38 UTC 
(rev 103365)
@@ -33,6 +33,7 @@
                        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' ),

Modified: trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql
===================================================================
--- trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql    
2011-11-16 19:51:36 UTC (rev 103364)
+++ trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql    
2011-11-16 19:54:38 UTC (rev 103365)
@@ -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,

Modified: trunk/phase3/maintenance/postgres/tables.sql
===================================================================
--- trunk/phase3/maintenance/postgres/tables.sql        2011-11-16 19:51:36 UTC 
(rev 103364)
+++ trunk/phase3/maintenance/postgres/tables.sql        2011-11-16 19:54:38 UTC 
(rev 103365)
@@ -360,11 +360,11 @@
 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,


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to