Skip to content
GitLab
Menu
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in / Register
Toggle navigation
Menu
Open sidebar
Donald Haase
Cockatrice
Commits
ce6c97bc
Commit
ce6c97bc
authored
Dec 13, 2015
by
ctrlaltca
Browse files
Merge pull request #1670 from jedinerd/sql_fix_for_token_disabled_option
Having token set to not null breaks the use of requireemail=false
parents
a17c300a
d9c0c97a
Changes
2
Hide whitespace changes
Inline
Side-by-side
servatrice/migrations/servatrice_0011_to_0012.sql
0 → 100644
View file @
ce6c97bc
-- 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
;
servatrice/servatrice.sql
View file @
ce6c97bc
...
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
...
@@ -20,7 +20,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_schema_version` (
PRIMARY
KEY
(
`version`
)
PRIMARY
KEY
(
`version`
)
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
;
)
ENGINE
=
MyISAM
DEFAULT
CHARSET
=
utf8
;
INSERT
INTO
cockatrice_schema_version
VALUES
(
1
1
);
INSERT
INTO
cockatrice_schema_version
VALUES
(
1
2
);
CREATE
TABLE
IF
NOT
EXISTS
`cockatrice_decklist_files`
(
CREATE
TABLE
IF
NOT
EXISTS
`cockatrice_decklist_files`
(
`id`
int
(
7
)
unsigned
zerofill
NOT
NULL
auto_increment
,
`id`
int
(
7
)
unsigned
zerofill
NOT
NULL
auto_increment
,
...
@@ -82,7 +82,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
...
@@ -82,7 +82,7 @@ CREATE TABLE IF NOT EXISTS `cockatrice_users` (
`avatar_bmp`
blob
NOT
NULL
,
`avatar_bmp`
blob
NOT
NULL
,
`registrationDate`
datetime
NOT
NULL
,
`registrationDate`
datetime
NOT
NULL
,
`active`
tinyint
(
1
)
NOT
NULL
,
`active`
tinyint
(
1
)
NOT
NULL
,
`token`
binary
(
16
)
NOT
NULL
,
`token`
binary
(
16
),
`clientid`
varchar
(
15
)
NOT
NULL
,
`clientid`
varchar
(
15
)
NOT
NULL
,
PRIMARY
KEY
(
`id`
),
PRIMARY
KEY
(
`id`
),
UNIQUE
KEY
`name`
(
`name`
),
UNIQUE
KEY
`name`
(
`name`
),
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment