r105349 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r105348‎ | r105349 | r105350 >
Date:20:49, 6 December 2011
Author:brion
Status:ok
Tags:
Comment:
MFT r100640, r103365, r103367 - uploadstash table was missing from postgresql
Modified paths:
  • /branches/REL1_18/phase3/includes/installer/PostgresUpdater.php (modified) (history)
  • /branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash.sql (added) (history)
  • /branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash_sequence.sql (added) (history)
  • /branches/REL1_18/phase3/maintenance/postgres/tables.sql (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash.sql
@@ -0,0 +1,24 @@
 2+CREATE SEQUENCE uploadstash_us_id_seq;
 3+CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
 4+
 5+CREATE TABLE uploadstash (
 6+ us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'),
 7+ us_user INTEGER,
 8+ us_key TEXT,
 9+ us_orig_path TEXT,
 10+ us_path TEXT,
 11+ us_source_type TEXT,
 12+ us_timestamp TIMESTAMPTZ,
 13+ us_status TEXT,
 14+ us_size INTEGER,
 15+ us_sha1 TEXT,
 16+ us_mime TEXT,
 17+ us_media_type media_type DEFAULT NULL,
 18+ us_image_width INTEGER,
 19+ us_image_height INTEGER,
 20+ us_image_bits INTEGER
 21+);
 22+
 23+CREATE INDEX us_user_idx ON uploadstash (us_user);
 24+CREATE UNIQUE INDEX us_key_idx ON uploadstash (us_key);
 25+CREATE INDEX us_timestamp_idx ON uploadstash (us_timestamp);
Property changes on: branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash.sql
___________________________________________________________________
Added: svn:eol-style
126 + native
Index: branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash_sequence.sql
@@ -0,0 +1,2 @@
 2+ALTER TABLE uploadstash RENAME us_id_seq TO uploadstash_us_id_seq;
 3+ALTER TABLE uploadstash ALTER COLUMN us_id SET DEFAULT NEXTVAL('uploadstash_us_id_seq');
Property changes on: branches/REL1_18/phase3/maintenance/postgres/archives/patch-uploadstash_sequence.sql
___________________________________________________________________
Added: svn:eol-style
14 + native
Index: branches/REL1_18/phase3/maintenance/postgres/tables.sql
@@ -358,7 +358,32 @@
359359 CREATE INDEX fa_notime ON filearchive (fa_deleted_timestamp);
360360 CREATE INDEX fa_nouser ON filearchive (fa_deleted_user);
361361
 362+CREATE SEQUENCE uploadstash_us_id_seq;
 363+CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE');
362364
 365+CREATE TABLE uploadstash (
 366+ us_id INTEGER PRIMARY KEY NOT NULL DEFAULT nextval('uploadstash_us_id_seq'),
 367+ us_user INTEGER,
 368+ us_key TEXT,
 369+ us_orig_path TEXT,
 370+ us_path TEXT,
 371+ us_source_type TEXT,
 372+ us_timestamp TIMESTAMPTZ,
 373+ us_status TEXT,
 374+ us_size INTEGER,
 375+ us_sha1 TEXT,
 376+ us_mime TEXT,
 377+ us_media_type media_type DEFAULT NULL,
 378+ us_image_width INTEGER,
 379+ us_image_height INTEGER,
 380+ us_image_bits INTEGER
 381+);
 382+
 383+CREATE INDEX us_user_idx ON uploadstash (us_user);
 384+CREATE UNIQUE INDEX us_key_idx ON uploadstash (us_key);
 385+CREATE INDEX us_timestamp_idx ON uploadstash (us_timestamp);
 386+
 387+
363388 CREATE SEQUENCE recentchanges_rc_id_seq;
364389 CREATE TABLE recentchanges (
365390 rc_id INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('recentchanges_rc_id_seq'),
Index: branches/REL1_18/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' ),
@@ -54,6 +55,7 @@
5556 array( 'addTable', 'msg_resource', 'patch-msg_resource.sql' ),
5657 array( 'addTable', 'msg_resource_links','patch-msg_resource_links.sql' ),
5758 array( 'addTable', 'module_deps', 'patch-module_deps.sql' ),
 59+ array( 'addTable', 'uploadstash', 'patch-uploadstash.sql' ),
5860
5961 # Needed before new field
6062 array( 'convertArchive2' ),

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r100640Update Postgres with missing uploadstash tablesoverlordq19:43, 24 October 2011
r103365Followup to r100640, use correct name scheme for sequence, correct references...overlordq19:54, 16 November 2011
r103367Followup to r103365, actually include said patch fileoverlordq19:55, 16 November 2011

Status & tagging log