Make filarchive width/height columns ints for Postgres (not smallint)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 2ba18eb..a7b483d 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -100,7 +100,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 11629) If $wgEmailConfirmToEdit is true, require people to supply an
   email address when registering.
 * (bug 11612) Days to show in recent changes cannot be larger than 7
-
+* (bug 11131) Change filearchive width/height columns to int for Postgres
 
 === API changes in 1.12 ===
 

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 5f925b6..ef88503 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -292,8 +292,8 @@ CREATE TABLE filearchive (
   fa_deleted_timestamp  TIMESTAMPTZ  NOT NULL,
   fa_deleted_reason     TEXT,
   fa_size               INTEGER      NOT NULL,
-  fa_width              SMALLINT     NOT NULL,
-  fa_height             SMALLINT     NOT NULL,
+  fa_width              INTEGER      NOT NULL,
+  fa_height             INTEGER      NOT NULL,
   fa_metadata           BYTEA        NOT NULL  DEFAULT '',
   fa_bits               SMALLINT,
   fa_media_type         TEXT,

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index fe93281..9069d64 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1365,8 +1365,10 @@ function do_postgres_updates() {
        $typechanges = array(
                array("archive",      "ar_deleted",      "smallint", ""),
                array("filearchive",  "fa_deleted",      "smallint", ""),
+               array("filearchive",  "fa_height",       "integer",  ""),
                array("filearchive",  "fa_metadata",     "bytea",    "decode(fa_metadata,'escape')"),
                array("filearchive",  "fa_size",         "integer",  ""),
+               array("filearchive",  "fa_width",        "integer",  ""),
                array("filearchive",  "fa_storage_group","text",     ""),
                array("filearchive",  "fa_storage_key",  "text",     ""),
                array("image",        "img_metadata",    "bytea",    "decode(img_metadata,'escape')"),