Merge branch 'master' of ssh://git.nemunai.re:6224/fic2014-server
This commit is contained in:
commit
bdf5f0ade2
11 changed files with 234 additions and 153 deletions
|
|
@ -101,7 +101,7 @@ CREATE TABLE IF NOT EXISTS `teams` (
|
|||
`team_name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`key_hash` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`auth_level` tinyint(1) NOT NULL,
|
||||
`company` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`slogan` varchar(64) COLLATE utf8_unicode_ci NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
|
||||
|
||||
|
|
@ -114,9 +114,10 @@ CREATE TABLE IF NOT EXISTS `teams` (
|
|||
CREATE TABLE IF NOT EXISTS `team_members` (
|
||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`id_team` int(10) unsigned NOT NULL,
|
||||
`firstname` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`lastname` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`nickname` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`firstname` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`lastname` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`nickname` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`company` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=MyISAM DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
|
||||
|
||||
|
|
@ -128,6 +129,6 @@ CREATE TABLE IF NOT EXISTS `team_members` (
|
|||
|
||||
CREATE TABLE IF NOT EXISTS `themes` (
|
||||
`id` int(10) unsigned NOT NULL AUTO_INCREMENT,
|
||||
`name` varchar(255) COLLATE utf8_unicode_ci NOT NULL,
|
||||
`name` varchar(32) COLLATE utf8_unicode_ci NOT NULL,
|
||||
PRIMARY KEY (`id`)
|
||||
) ENGINE=InnoDB DEFAULT CHARSET=utf8 COLLATE=utf8_unicode_ci AUTO_INCREMENT=1 ;
|
||||
|
|
|
|||
Reference in a new issue