Merge "Add missing uploadstash.us_props for PostgreSQL"

diff --combined includes/installer/PostgresUpdater.php
index fa58a62,dd07bc2..cd5a8ad
--- 1/includes/installer/PostgresUpdater.php
--- 2/includes/installer/PostgresUpdater.php
+++ b/includes/installer/PostgresUpdater.php
@@@ -169,6 -169,7 +169,7 @@@ class PostgresUpdater extends DatabaseU
                                "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('archive_ar_id_seq')" ),
                        array( 'addPgField', 'externallinks', 'el_id',
                                "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('externallinks_el_id_seq')" ),
+                       array( 'addPgField', 'uploadstash', 'us_props', "BYTEA" ),
  
                        # type changes
                        array( 'changeField', 'archive', 'ar_deleted', 'smallint', '' ),
@@@ -259,8 -260,6 +260,8 @@@
                        array( 'addPgIndex', 'job', 'job_cmd_token', '(job_cmd, job_token, job_random)' ),
                        array( 'addPgIndex', 'job', 'job_cmd_token_id', '(job_cmd, job_token, job_id)' ),
                        array( 'addPgIndex', 'filearchive', 'fa_sha1', '(fa_sha1)' ),
 +                      array( 'addPgIndex', 'logging', 'logging_user_text_type_time', '(log_user_text, log_type, log_timestamp)' ),
 +                      array( 'addPgIndex', 'logging', 'logging_user_text_time', '(log_user_text, log_timestamp)' ),
  
                        array( 'checkIndex', 'pagelink_unique', array(
                                array( 'pl_from', 'int4_ops', 'btree', 0 ),
@@@ -401,8 -400,7 +402,8 @@@
                        array( 'tsearchFixes' ),
  
                        // 1.23
 -                      array( 'addPgField', 'recentchanges', 'rc_source',            "TEXT NOT NULL DEFAULT ''" ),
 +                      array( 'addPgField', 'recentchanges', 'rc_source', "TEXT NOT NULL DEFAULT ''" ),
 +                      array( 'addPgField', 'page', 'page_links_updated', "TIMESTAMPTZ NULL" ),
                );
        }
  

diff --combined maintenance/postgres/tables.sql
index 93e931c,37c8cf6..3aa8109
--- 1/maintenance/postgres/tables.sql
--- 2/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@@ -80,7 -80,6 +80,7 @@@ CREATE TABLE page 
    page_is_new        SMALLINT       NOT NULL  DEFAULT 0,
    page_random        NUMERIC(15,14) NOT NULL  DEFAULT RANDOM(),
    page_touched       TIMESTAMPTZ,
 +  page_links_updated TIMESTAMPTZ    NULL,
    page_latest        INTEGER        NOT NULL, -- FK?
    page_len           INTEGER        NOT NULL,
    page_content_model TEXT
@@@ -229,9 -228,9 +229,9 @@@ CREATE TABLE categorylinks 
  CREATE UNIQUE INDEX cl_from ON categorylinks (cl_from, cl_to);
  CREATE INDEX cl_sortkey     ON categorylinks (cl_to, cl_sortkey, cl_from);
  
 -CREATE SEQUENCE externallinks_id_seq;
 +CREATE SEQUENCE externallinks_el_id_seq;
  CREATE TABLE externallinks (
 -  el_id     INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('externallinks_id_seq'),
 +  el_id     INTEGER  NOT NULL  PRIMARY KEY DEFAULT nextval('externallinks_el_id_seq'),
    el_from   INTEGER  NOT NULL  REFERENCES page(page_id) ON DELETE CASCADE DEFERRABLE INITIALLY DEFERRED,
    el_to     TEXT     NOT NULL,
    el_index  TEXT     NOT NULL
@@@ -377,6 -376,7 +377,7 @@@ CREATE TABLE uploadstash 
    us_key          TEXT,
    us_orig_path    TEXT,
    us_path         TEXT,
+   us_props        BYTEA,
    us_source_type  TEXT,
    us_timestamp    TIMESTAMPTZ,
    us_status       TEXT,
@@@ -511,8 -511,6 +512,8 @@@ CREATE INDEX logging_page_time ON loggi
  CREATE INDEX logging_times ON logging (log_timestamp);
  CREATE INDEX logging_user_type_time ON logging (log_user, log_type, log_timestamp);
  CREATE INDEX logging_page_id_time ON logging (log_page, log_timestamp);
 +CREATE INDEX logging_user_text_type_time ON logging (log_user_text, log_type, log_timestamp);
 +CREATE INDEX logging_user_text_time ON logging (log_user_text, log_timestamp);
  
  CREATE TABLE log_search (
    ls_field   TEXT     NOT NULL,