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; |
3 | 3 | CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE'); |
4 | 4 | |
5 | 5 | 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'), |
7 | 7 | us_user INTEGER, |
8 | 8 | us_key TEXT, |
9 | 9 | us_orig_path TEXT, |
Index: trunk/phase3/maintenance/postgres/tables.sql |
— | — | @@ -360,11 +360,11 @@ |
361 | 361 | CREATE INDEX fa_notime ON filearchive (fa_deleted_timestamp); |
362 | 362 | CREATE INDEX fa_nouser ON filearchive (fa_deleted_user); |
363 | 363 | |
364 | | -CREATE SEQUENCE us_id_seq; |
| 364 | +CREATE SEQUENCE uploadstash_us_id_seq; |
365 | 365 | CREATE TYPE media_type AS ENUM ('UNKNOWN','BITMAP','DRAWING','AUDIO','VIDEO','MULTIMEDIA','OFFICE','TEXT','EXECUTABLE','ARCHIVE'); |
366 | 366 | |
367 | 367 | 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'), |
369 | 369 | us_user INTEGER, |
370 | 370 | us_key TEXT, |
371 | 371 | us_orig_path TEXT, |
Index: trunk/phase3/includes/installer/PostgresUpdater.php |
— | — | @@ -33,6 +33,7 @@ |
34 | 34 | array( 'renameSequence', 'rc_rc_id_seq', 'recentchanges_rc_id_seq' ), |
35 | 35 | array( 'renameSequence', 'log_log_id_seq', 'logging_log_id_seq' ), |
36 | 36 | array( 'renameSequence', 'pr_id_val', 'page_restrictions_pr_id_seq' ), |
| 37 | + array( 'renameSequence', 'us_id_seq', 'uploadstash_us_id_seq' ), |
37 | 38 | |
38 | 39 | # new tables |
39 | 40 | array( 'addTable', 'category', 'patch-category.sql' ), |