From af564389ad8247d9afed46db89b60ed4a7277a4a Mon Sep 17 00:00:00 2001 From: Sam Reed Date: Wed, 28 Sep 2011 19:38:34 +0000 Subject: [PATCH] Followup r98339, r98355 Let's pretend the column never existed --- tests/phpunit/includes/db/sqlite/tables-1.13.sql | 3 +-- tests/phpunit/includes/db/sqlite/tables-1.15.sql | 5 ++--- tests/phpunit/includes/db/sqlite/tables-1.16.sql | 1 - tests/phpunit/includes/db/sqlite/tables-1.17.sql | 1 - 4 files changed, 3 insertions(+), 7 deletions(-) diff --git a/tests/phpunit/includes/db/sqlite/tables-1.13.sql b/tests/phpunit/includes/db/sqlite/tables-1.13.sql index a0dcb5535a..523cae7884 100644 --- a/tests/phpunit/includes/db/sqlite/tables-1.13.sql +++ b/tests/phpunit/includes/db/sqlite/tables-1.13.sql @@ -8,7 +8,6 @@ CREATE TABLE /*$wgDBprefix*/user ( user_newpassword tinyblob , user_newpass_time BLOB, user_email tinytext , - user_options blob , user_touched BLOB default '', user_token BLOB default '', user_email_authenticated BLOB, @@ -123,7 +122,7 @@ CREATE TABLE /*$wgDBprefix*/site_stats ( ss_images INTEGER default '0') /*$wgDBTableOptions*/; CREATE TABLE /*$wgDBprefix*/hitcounter ( - hc_id INTEGER + hc_id INTEGER ) ; CREATE TABLE /*$wgDBprefix*/ipblocks ( diff --git a/tests/phpunit/includes/db/sqlite/tables-1.15.sql b/tests/phpunit/includes/db/sqlite/tables-1.15.sql index 901bac52a7..6a1430ef9e 100644 --- a/tests/phpunit/includes/db/sqlite/tables-1.15.sql +++ b/tests/phpunit/includes/db/sqlite/tables-1.15.sql @@ -10,7 +10,6 @@ CREATE TABLE /*_*/user ( user_newpassword tinyblob NOT NULL, user_newpass_time binary(14), user_email tinytext NOT NULL, - user_options blob NOT NULL, user_touched binary(14) NOT NULL default '', user_token binary(32) NOT NULL default '', user_email_authenticated binary(14), @@ -141,7 +140,7 @@ CREATE INDEX /*i*/el_to ON /*_*/externallinks (el_to(60), el_from); CREATE INDEX /*i*/el_index ON /*_*/externallinks (el_index(60)); CREATE TABLE /*_*/langlinks ( ll_from int unsigned NOT NULL default 0, - + ll_lang varbinary(20) NOT NULL default '', ll_title varchar(255) binary NOT NULL default '' ) /*$wgDBTableOptions*/; @@ -181,7 +180,7 @@ CREATE TABLE /*_*/ipblocks ( ipb_block_email bool NOT NULL default 0, ipb_allow_usertalk bool NOT NULL default 0 ) /*$wgDBTableOptions*/; - + CREATE UNIQUE INDEX /*i*/ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only); CREATE INDEX /*i*/ipb_user ON /*_*/ipblocks (ipb_user); CREATE INDEX /*i*/ipb_range ON /*_*/ipblocks (ipb_range_start(8), ipb_range_end(8)); diff --git a/tests/phpunit/includes/db/sqlite/tables-1.16.sql b/tests/phpunit/includes/db/sqlite/tables-1.16.sql index 6e56add238..57894e9482 100644 --- a/tests/phpunit/includes/db/sqlite/tables-1.16.sql +++ b/tests/phpunit/includes/db/sqlite/tables-1.16.sql @@ -10,7 +10,6 @@ CREATE TABLE /*_*/user ( user_newpassword tinyblob NOT NULL, user_newpass_time binary(14), user_email tinytext NOT NULL, - user_options blob NOT NULL, user_touched binary(14) NOT NULL default '', user_token binary(32) NOT NULL default '', user_email_authenticated binary(14), diff --git a/tests/phpunit/includes/db/sqlite/tables-1.17.sql b/tests/phpunit/includes/db/sqlite/tables-1.17.sql index 69ae376498..9719fe9757 100644 --- a/tests/phpunit/includes/db/sqlite/tables-1.17.sql +++ b/tests/phpunit/includes/db/sqlite/tables-1.17.sql @@ -10,7 +10,6 @@ CREATE TABLE /*_*/user ( user_newpassword tinyblob NOT NULL, user_newpass_time binary(14), user_email tinytext NOT NULL, - user_options blob NOT NULL, user_touched binary(14) NOT NULL default '', user_token binary(32) NOT NULL default '', user_email_authenticated binary(14), -- 2.20.1