Revert r98355 and r98357; drop the field instead.

diff --git a/includes/installer/SqliteUpdater.php b/includes/installer/SqliteUpdater.php
index 28f5a9e..04b6a31 100644 (file)
--- a/includes/installer/SqliteUpdater.php
+++ b/includes/installer/SqliteUpdater.php
@@ -64,6 +64,7 @@ class SqliteUpdater extends DatabaseUpdater {
                        array( 'addTable', 'config',                            'patch-config.sql' ),
                        array( 'addIndex', 'logging',       'type_action',      'patch-logging-type-action-index.sql'),
                        array( 'doMigrateUserOptions' ),
+                       array( 'dropField', 'user',         'user_options', 'patch-drop-user_options.sql' ),
                );
        }
 

diff --git a/maintenance/sqlite/archives/initial-indexes.sql b/maintenance/sqlite/archives/initial-indexes.sql
index 0c0cef8..c40df11 100644 (file)
--- a/maintenance/sqlite/archives/initial-indexes.sql
+++ b/maintenance/sqlite/archives/initial-indexes.sql
@@ -41,6 +41,7 @@ CREATE TABLE /*_*/user_tmp (
   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/maintenance/sqlite/archives/patch-drop-user_options.sql b/maintenance/sqlite/archives/patch-drop-user_options.sql
new file mode 100644 (file)
index 0000000..1209a97
--- /dev/null
+++ b/maintenance/sqlite/archives/patch-drop-user_options.sql
@@ -0,0 +1,31 @@
+-- Remove user_options field from user table\r
+\r
+CREATE TABLE /*_*/user_tmp (\r
+  user_id int unsigned NOT NULL PRIMARY KEY AUTO_INCREMENT,\r
+  user_name varchar(255) binary NOT NULL default '',\r
+  user_real_name varchar(255) binary NOT NULL default '',\r
+  user_password tinyblob NOT NULL,\r
+  user_newpassword tinyblob NOT NULL,\r
+  user_newpass_time binary(14),\r
+  user_email tinytext NOT NULL,\r
+  user_touched binary(14) NOT NULL default '',\r
+  user_token binary(32) NOT NULL default '',\r
+  user_email_authenticated binary(14),\r
+  user_email_token binary(32),\r
+  user_email_token_expires binary(14),\r
+  user_registration binary(14),\r
+  user_editcount int\r
+) /*$wgDBTableOptions*/;\r
+\r
+INSERT INTO /*_*/user_tmp\r
+       SELECT user_id, user_name, user_real_name, user_password, user_newpassword, user_newpass_time, user_email, user_touched,\r
+               user_token, user_email_authenticated, user_email_token, user_email_token_expires, user_registration, user_editcount\r
+               FROM /*_*/user;\r
+\r
+DROP TABLE /*_*/user;\r
+\r
+ALTER TABLE /*_*/user_tmp RENAME TO /*_*/user;\r
+\r
+CREATE UNIQUE INDEX /*i*/user_name ON /*_*/user (user_name);\r
+CREATE INDEX /*i*/user_email_token ON /*_*/user (user_email_token);\r
+CREATE INDEX /*i*/user_email ON /*_*/user (user_email(50));\r

diff --git a/tests/phpunit/includes/db/DatabaseSqliteTest.php b/tests/phpunit/includes/db/DatabaseSqliteTest.php
index c6c71ce..5a53815 100644 (file)
--- a/tests/phpunit/includes/db/DatabaseSqliteTest.php
+++ b/tests/phpunit/includes/db/DatabaseSqliteTest.php
@@ -196,7 +196,6 @@ class DatabaseSqliteTest extends MediaWikiTestCase {
                // Mismatches for these columns we can safely ignore
                $ignoredColumns = array(
                        'user_newtalk.user_last_timestamp', // r84185
-                       'user.user_options',
                );
 
                $currentDB = new DatabaseSqliteStandalone( ':memory:' );

diff --git a/tests/phpunit/includes/db/sqlite/tables-1.13.sql b/tests/phpunit/includes/db/sqlite/tables-1.13.sql
index 523cae7..66847ab 100644 (file)
--- a/tests/phpunit/includes/db/sqlite/tables-1.13.sql
+++ b/tests/phpunit/includes/db/sqlite/tables-1.13.sql
@@ -8,6 +8,7 @@ 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,

diff --git a/tests/phpunit/includes/db/sqlite/tables-1.15.sql b/tests/phpunit/includes/db/sqlite/tables-1.15.sql
index 6a1430e..6b3a628 100644 (file)
--- a/tests/phpunit/includes/db/sqlite/tables-1.15.sql
+++ b/tests/phpunit/includes/db/sqlite/tables-1.15.sql
@@ -10,6 +10,7 @@ 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.16.sql b/tests/phpunit/includes/db/sqlite/tables-1.16.sql
index 57894e9..6e56add 100644 (file)
--- a/tests/phpunit/includes/db/sqlite/tables-1.16.sql
+++ b/tests/phpunit/includes/db/sqlite/tables-1.16.sql
@@ -10,6 +10,7 @@ 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 9719fe9..69ae376 100644 (file)
--- a/tests/phpunit/includes/db/sqlite/tables-1.17.sql
+++ b/tests/phpunit/includes/db/sqlite/tables-1.17.sql
@@ -10,6 +10,7 @@ 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),