r103365 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r103364‎ | r103365 | r103366 >
Date:19:54, 16 November 2011
Author:overlordq
Status:resolved (Comments)
Tags:
Comment:
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 (modified) (history)
  • /trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql (modified) (history)
  • /trunk/phase3/maintenance/postgres/tables.sql (modified) (history)

Diff [purge]

Index: trunk/phase3/maintenance/postgres/archives/patch-uploadstash.sql
@@ -1,8 +1,8 @@
2 -CREATE SEQUENCE us_id_seq;
 2+CREATE SEQUENCE uploadstash_us_id_seq;
33 CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
44
55 CREATE TABLE uploadstash (
6 - us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('us_id_seq'),
 6+ us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'),
77 us_user INTEGER,
88 us_key TEXT,
99 us_orig_path TEXT,
Index: trunk/phase3/maintenance/postgres/tables.sql
@@ -360,11 +360,11 @@
361361 CREATE INDEX fa_notime ON filearchive (fa_deleted_timestamp);
362362 CREATE INDEX fa_nouser ON filearchive (fa_deleted_user);
363363
364 -CREATE SEQUENCE us_id_seq;
 364+CREATE SEQUENCE uploadstash_us_id_seq;
365365 CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
366366
367367 CREATE TABLE uploadstash (
368 - us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('us_id_seq'),
 368+ us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'),
369369 us_user INTEGER,
370370 us_key TEXT,
371371 us_orig_path TEXT,
Index: trunk/phase3/includes/installer/PostgresUpdater.php
@@ -33,6 +33,7 @@
3434 array( 'renameSequence', 'rc_rc_id_seq', 'recentchanges_rc_id_seq' ),
3535 array( 'renameSequence', 'log_log_id_seq', 'logging_log_id_seq' ),
3636 array( 'renameSequence', 'pr_id_val', 'page_restrictions_pr_id_seq' ),
 37+ array( 'renameSequence', 'us_id_seq', 'uploadstash_us_id_seq' ),
3738
3839 # new tables
3940 array( 'addTable', 'category', 'patch-category.sql' ),

Follow-up revisions

RevisionCommit summaryAuthorDate
r103367Followup to r103365, actually include said patch fileoverlordq19:55, 16 November 2011
r105349MFT r100640, r103365, r103367 - uploadstash table was missing from postgresqlbrion20:49, 6 December 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100640Update Postgres with missing uploadstash tablesoverlordq19:43, 24 October 2011

Comments

#Comment by Brion VIBBER (talk | contribs)   20:30, 6 December 2011

Needs merge to 1.18 as well

Status & tagging log