Add ipb_block_email column

diff --git a/maintenance/postgres/tables.sql b/maintenance/postgres/tables.sql
index 8bcf3a5..c6bd87d 100644 (file)
--- a/maintenance/postgres/tables.sql
+++ b/maintenance/postgres/tables.sql
@@ -227,7 +227,9 @@ CREATE TABLE ipblocks (
   ipb_expiry            TIMESTAMPTZ  NOT NULL,
   ipb_range_start       TEXT,
   ipb_range_end         TEXT,
-  ipb_deleted           INTEGER      NOT NULL  DEFAULT 0
+  ipb_deleted           INTEGER      NOT NULL  DEFAULT 0,
+  ipb_block_email       CHAR         NOT NULL  DEFAULT '0'
+
 );
 CREATE INDEX ipb_address ON ipblocks (ipb_address);
 CREATE INDEX ipb_user    ON ipblocks (ipb_user);
@@ -263,10 +265,10 @@ CREATE TABLE oldimage (
   oi_user          INTEGER          NULL  REFERENCES mwuser(user_id) ON DELETE SET NULL,
   oi_user_text     TEXT         NOT NULL,
   oi_timestamp     TIMESTAMPTZ  NOT NULL,
-  oi_metadata      BYTEA        NOT NULL,       
-  oi_media_type    TEXT             NULL,       
-  oi_major_mime    TEXT         NOT NULL DEFAULT 'unknown',     
-  oi_minor_mime    TEXT         NOT NULL DEFAULT 'unknown',     
+  oi_metadata      BYTEA        NOT NULL,
+  oi_media_type    TEXT             NULL,
+  oi_major_mime    TEXT         NOT NULL DEFAULT 'unknown',
+  oi_minor_mime    TEXT         NOT NULL DEFAULT 'unknown',
   oi_deleted       CHAR         NOT NULL DEFAULT '0'
 );
 CREATE INDEX oi_name_timestamp ON oldimage (oi_name,oi_timestamp);

diff --git a/maintenance/updaters.inc b/maintenance/updaters.inc
index 6603861..21c43cc 100644 (file)
--- a/maintenance/updaters.inc
+++ b/maintenance/updaters.inc
@@ -1232,6 +1232,7 @@ function do_postgres_updates() {
        $newcols = array(
                array("archive",       "ar_len",               "INTEGER"),
                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_enable_autoblock", "CHAR NOT NULL DEFAULT '1'"),