More _deleted normalizing

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 62aa4bd..11877bb 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1330,29 +1330,29 @@ function do_postgres_updates() {
        );
 
        $newcols = array(
-               array("archive",       "ar_deleted",           "INTEGER NOT NULL DEFAULT 0"),
+               array("archive",       "ar_deleted",           "SMALLINT NOT NULL DEFAULT 0"),
                array("archive",       "ar_len",               "INTEGER"),
                array("archive",       "ar_page_id",           "INTEGER"),
                array("image",         "img_sha1",             "TEXT NOT NULL DEFAULT ''"),
                array("ipblocks",      "ipb_anon_only",        "CHAR NOT NULL DEFAULT '0'"),
                array("ipblocks",      "ipb_block_email",      "CHAR NOT NULL DEFAULT '0'"),
                array("ipblocks",      "ipb_create_account",   "CHAR NOT NULL DEFAULT '1'"),
-               array("ipblocks",      "ipb_deleted",          "INTEGER NOT NULL DEFAULT 0"),
+               array("ipblocks",      "ipb_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
                array("ipblocks",      "ipb_enable_autoblock", "CHAR NOT NULL DEFAULT '1'"),
-               array("filearchive",   "fa_deleted",           "INTEGER NOT NULL DEFAULT 0"),
-               array("logging",       "log_deleted",          "INTEGER NOT NULL DEFAULT 0"),
+               array("filearchive",   "fa_deleted",           "SMALLINT NOT NULL DEFAULT 0"),
+               array("logging",       "log_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
                array("logging",       "log_id",               "INTEGER NOT NULL PRIMARY KEY DEFAULT nextval('log_log_id_seq')"),
                array("logging",       "log_params",           "TEXT"),
                array("mwuser",        "user_editcount",       "INTEGER"),
                array("mwuser",        "user_newpass_time",    "TIMESTAMPTZ"),
-               array("oldimage",      "oi_deleted",           "CHAR NOT NULL DEFAULT '0'"),
+               array("oldimage",      "oi_deleted",           "SMALLINT NOT NULL DEFAULT 0"),
                array("oldimage",      "oi_metadata",          "BYTEA NOT NULL DEFAULT ''"),
                array("oldimage",      "oi_media_type",        "TEXT"),
                array("oldimage",      "oi_major_mime",        "TEXT NOT NULL DEFAULT 'unknown'"),
                array("oldimage",      "oi_minor_mime",        "TEXT NOT NULL DEFAULT 'unknown'"),
                array("oldimage",      "oi_sha1",              "TEXT NOT NULL DEFAULT ''"),
                array("page_restrictions", "pr_id",            "INTEGER NOT NULL UNIQUE DEFAULT nextval('pr_id_val')"),
-               array("recentchanges", "rc_deleted",           "INTEGER NOT NULL DEFAULT 0"),
+               array("recentchanges", "rc_deleted",           "SMALLINT NOT NULL DEFAULT 0"),
                array("recentchanges", "rc_log_action",        "TEXT"),
         array("recentchanges", "rc_log_type",          "TEXT"),
         array("recentchanges", "rc_logid",             "INTEGER NOT NULL DEFAULT 0"),
@@ -1360,7 +1360,7 @@ function do_postgres_updates() {
                array("recentchanges", "rc_old_len",           "INTEGER"),
                array("recentchanges", "rc_params",            "TEXT"),
                array("revision",      "rev_len",              "INTEGER"),
-               array("revision",      "rev_deleted",          "INTEGER NOT NULL DEFAULT 0"),
+               array("revision",      "rev_deleted",          "SMALLINT NOT NULL DEFAULT 0"),
        );
 
 
@@ -1379,7 +1379,7 @@ function do_postgres_updates() {
                array("image",        "img_width",       "integer",  ""),
                array("image",        "img_height",      "integer",  ""),
                array("ipblocks",     "ipb_address",     "text",     "ipb_address::text"),
-               array("ipblocks",     "ipb_deleted",     "char",     ""),
+               array("ipblocks",     "ipb_deleted",     "smallint", ""),
                array("math",         "math_inputhash",  "bytea",    "decode(math_inputhash,'escape')"),
                array("math",         "math_outputhash", "bytea",    "decode(math_outputhash,'escape')"),
                array("mwuser",       "user_token",      "text",     ""),