Index: trunk/phase3/maintenance/postgres/tables.sql |
— | — | @@ -227,7 +227,9 @@ |
228 | 228 | ipb_expiry TIMESTAMPTZ NOT NULL, |
229 | 229 | ipb_range_start TEXT, |
230 | 230 | ipb_range_end TEXT, |
231 | | - ipb_deleted INTEGER NOT NULL DEFAULT 0 |
| 231 | + ipb_deleted INTEGER NOT NULL DEFAULT 0, |
| 232 | + ipb_block_email CHAR NOT NULL DEFAULT '0' |
| 233 | + |
232 | 234 | ); |
233 | 235 | CREATE INDEX ipb_address ON ipblocks (ipb_address); |
234 | 236 | CREATE INDEX ipb_user ON ipblocks (ipb_user); |
— | — | @@ -263,10 +265,10 @@ |
264 | 266 | oi_user INTEGER NULL REFERENCES mwuser(user_id) ON DELETE SET NULL, |
265 | 267 | oi_user_text TEXT NOT NULL, |
266 | 268 | oi_timestamp TIMESTAMPTZ NOT NULL, |
267 | | - oi_metadata BYTEA NOT NULL, |
268 | | - oi_media_type TEXT NULL, |
269 | | - oi_major_mime TEXT NOT NULL DEFAULT 'unknown', |
270 | | - oi_minor_mime TEXT NOT NULL DEFAULT 'unknown', |
| 269 | + oi_metadata BYTEA NOT NULL, |
| 270 | + oi_media_type TEXT NULL, |
| 271 | + oi_major_mime TEXT NOT NULL DEFAULT 'unknown', |
| 272 | + oi_minor_mime TEXT NOT NULL DEFAULT 'unknown', |
271 | 273 | oi_deleted CHAR NOT NULL DEFAULT '0' |
272 | 274 | ); |
273 | 275 | CREATE INDEX oi_name_timestamp ON oldimage (oi_name,oi_timestamp); |
Index: trunk/phase3/maintenance/updaters.inc |
— | — | @@ -1232,6 +1232,7 @@ |
1233 | 1233 | $newcols = array( |
1234 | 1234 | array("archive", "ar_len", "INTEGER"), |
1235 | 1235 | array("ipblocks", "ipb_anon_only", "CHAR NOT NULL DEFAULT '0'"), |
| 1236 | + array("ipblocks", "ipb_block_email", "CHAR NOT NULL DEFAULT '0'"), |
1236 | 1237 | array("ipblocks", "ipb_create_account", "CHAR NOT NULL DEFAULT '1'"), |
1237 | 1238 | array("ipblocks", "ipb_deleted", "INTEGER NOT NULL DEFAULT 0"), |
1238 | 1239 | array("ipblocks", "ipb_enable_autoblock", "CHAR NOT NULL DEFAULT '1'"), |