dave/pathfinder
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/develop' into develop

Browse Source
This commit is contained in:
Exodus4D
2015-11-19 21:57:24 +01:00
parent d333520126 cbe596f76b
commit d29c2d6b83
1 changed files with 2 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
pathfinder.sql
View File

@@ -517,7 +517,7 @@ CREATE TABLE `system` (
`statusId` tinyint(1) NOT NULL DEFAULT '1',
`locked` tinyint(1) NOT NULL DEFAULT '0',
`rally` tinyint(1) NOT NULL DEFAULT '0',
`description` mediumtext COLLATE utf8_bin NOT NULL,
`description` mediumtext COLLATE utf8_bin NOT NULL DEFAULT '',
`posX` int(11) NOT NULL DEFAULT '0',
`posY` int(11) NOT NULL DEFAULT '0',
`createdCharacterId` int(11) NOT NULL,
@@ -948,7 +948,7 @@ CREATE TABLE `user` (
`id` int(11) NOT NULL AUTO_INCREMENT,
`created` datetime NOT NULL DEFAULT CURRENT_TIMESTAMP,
`updated` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
`lastLogin` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
`lastLogin` timestamp NOT NULL DEFAULT '1970-01-01 00:00:01',
`active` tinyint(1) NOT NULL DEFAULT '1',
`name` varchar(255) COLLATE utf8_bin NOT NULL,
`email` varchar(255) COLLATE utf8_bin NOT NULL,