Merge pull request #1670 from jedinerd/sql_fix_for_token_disabled_option
Having token set to not null breaks the use of requireemail=false
This commit is contained in:
commit
ce6c97bcef
2 changed files with 7 additions and 2 deletions
5
servatrice/migrations/servatrice_0011_to_0012.sql
Normal file
5
servatrice/migrations/servatrice_0011_to_0012.sql
Normal file
|
@ -0,0 +1,5 @@
|
|||
-- Servatrice db migration from version 11 to version 12
|
||||
|
||||
alter table cockatrice_users modify token binary(16) NULL;
|
||||
|
||||
UPDATE cockatrice_schema_version SET version=12 WHERE version=11;
|
|
@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
|
|||
PRIMARY KEY (`version`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8;
|
||||
|
||||
INSERT INTO cockatrice_schema_version VALUES(11);
|
||||
INSERT INTO cockatrice_schema_version VALUES(12);
|
||||
|
||||
CREATE TABLE IF NOT EXISTS `cockatrice_decklist_files` (
|
||||
`id` int(7) unsigned zerofill NOT NULL auto_increment,
|
||||
|
@ -82,7 +82,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
|
|||
`avatar_bmp` blob NOT NULL,
|
||||
`registrationDate` datetime NOT NULL,
|
||||
`active` tinyint(1) NOT NULL,
|
||||
`token` binary(16) NOT NULL,
|
||||
`token` binary(16),
|
||||
`clientid` varchar(15) NOT NULL,
|
||||
PRIMARY KEY (`id`),
|
||||
UNIQUE KEY `name` (`name`),
|
||||
|
|
Loading…
Reference in a new issue