r98357 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r98356‎ | r98357 | r98358 >
Date:19:38, 28 September 2011
Author:reedy
Status:reverted (Comments)
Tags:
Comment:
Followup r98339, r98355

Let's pretend the column never existed
Modified paths:
  • /trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.13.sql (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.15.sql (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.16.sql (modified) (history)
  • /trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.17.sql (modified) (history)

Diff [purge]

Index: trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.13.sql
@@ -8,7 +8,6 @@
99 user_newpassword tinyblob ,
1010 user_newpass_time BLOB,
1111 user_email tinytext ,
12 - user_options blob ,
1312 user_touched BLOB default '',
1413 user_token BLOB default '',
1514 user_email_authenticated BLOB,
@@ -123,7 +122,7 @@
124123 ss_images INTEGER default '0') /*$wgDBTableOptions*/;
125124
126125 CREATE TABLE /*$wgDBprefix*/hitcounter (
127 - hc_id INTEGER
 126+ hc_id INTEGER
128127 ) ;
129128
130129 CREATE TABLE /*$wgDBprefix*/ipblocks (
Index: trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.15.sql
@@ -10,7 +10,6 @@
1111 user_newpassword tinyblob NOT NULL,
1212 user_newpass_time binary(14),
1313 user_email tinytext NOT NULL,
14 - user_options blob NOT NULL,
1514 user_touched binary(14) NOT NULL default '',
1615 user_token binary(32) NOT NULL default '',
1716 user_email_authenticated binary(14),
@@ -141,7 +140,7 @@
142141 CREATE INDEX /*i*/el_index ON /*_*/externallinks (el_index(60));
143142 CREATE TABLE /*_*/langlinks (
144143 ll_from int unsigned NOT NULL default 0,
145 -
 144+
146145 ll_lang varbinary(20) NOT NULL default '',
147146 ll_title varchar(255) binary NOT NULL default ''
148147 ) /*$wgDBTableOptions*/;
@@ -181,7 +180,7 @@
182181 ipb_block_email bool NOT NULL default 0,
183182 ipb_allow_usertalk bool NOT NULL default 0
184183 ) /*$wgDBTableOptions*/;
185 -
 184+
186185 CREATE UNIQUE INDEX /*i*/ipb_address ON /*_*/ipblocks (ipb_address(255), ipb_user, ipb_auto, ipb_anon_only);
187186 CREATE INDEX /*i*/ipb_user ON /*_*/ipblocks (ipb_user);
188187 CREATE INDEX /*i*/ipb_range ON /*_*/ipblocks (ipb_range_start(8), ipb_range_end(8));
Index: trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.16.sql
@@ -10,7 +10,6 @@
1111 user_newpassword tinyblob NOT NULL,
1212 user_newpass_time binary(14),
1313 user_email tinytext NOT NULL,
14 - user_options blob NOT NULL,
1514 user_touched binary(14) NOT NULL default '',
1615 user_token binary(32) NOT NULL default '',
1716 user_email_authenticated binary(14),
Index: trunk/phase3/tests/phpunit/includes/db/sqlite/tables-1.17.sql
@@ -10,7 +10,6 @@
1111 user_newpassword tinyblob NOT NULL,
1212 user_newpass_time binary(14),
1313 user_email tinytext NOT NULL,
14 - user_options blob NOT NULL,
1514 user_touched binary(14) NOT NULL default '',
1615 user_token binary(32) NOT NULL default '',
1716 user_email_authenticated binary(14),

Follow-up revisions

RevisionCommit summaryAuthorDate
r98657Revert r98355 and r98357; drop the field instead.maxsem06:10, 2 October 2011

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r98339* (bug 31204) Remove old user.user_options...reedy18:08, 28 September 2011
r98355Followup r98339...reedy19:28, 28 September 2011

Comments

#Comment by MaxSem (talk | contribs)   19:43, 28 September 2011

Eh, no. Regression tests are there to check how upgrades from real previous versions work, not how they would have worked if this or that...

#Comment by Reedy (talk | contribs)   19:44, 28 September 2011

How the hell do I stop it failing with it finding an extra column then?

Status & tagging log