From 66a7c0e7a406444a8bf0ed9ea170368e137121cd Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Martin=20St=C3=A4hr?= <software@mstaehr.net> Date: Fri, 3 Aug 2018 23:45:45 +0200 Subject: [PATCH] #40 fix: add isStudent back, was removed by someone before --- .../src/scripts/dbschema/fltrail.sql | 71 +++---------------- 1 file changed, 9 insertions(+), 62 deletions(-) diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql index 1391899c..2a353a77 100644 --- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql +++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql @@ -17,52 +17,24 @@ CREATE TABLE if not exists `projects` ( `token` varchar(400) NOT NULL, `phase` varchar(400) NOT NULL -) - - ENGINE = InnoDB - - DEFAULT CHARSET = utf8; +)ENGINE = InnoDB DEFAULT CHARSET = utf8; CREATE TABLE if not exists `groups` ( - `id` int NOT NULL AUTO_INCREMENT, - `projectId` varchar(400) NOT NULL, - `chatRoomId` varchar(400) NOT NULL, - PRIMARY KEY (id) +) ENGINE = InnoDB DEFAULT CHARSET = utf8; -) - - ENGINE = InnoDB - - DEFAULT CHARSET = utf8; - -CREATE TABLE if not exists groupuser - -( - +CREATE TABLE if not exists groupuser ( userEmail varchar(400) NOT NULL, - groupId int NOT NULL - -) - - ENGINE = InnoDB - - DEFAULT CHARSET = utf8; +) ENGINE = InnoDB DEFAULT CHARSET = utf8; CREATE TABLE if not exists `tags` ( - `projectId` varchar(100) NOT NULL, - `tag` varchar(400) NOT NULL - -) - - ENGINE = InnoDB - +) ENGINE = InnoDB DEFAULT CHARSET = utf8; CREATE TABLE if not exists `users` ( @@ -72,24 +44,18 @@ CREATE TABLE if not exists `users` ( `token` varchar(800) NOT NULL, `rocketChatId` varchar(400) NOT NULL, `rocketChatAuthToken` varchar(800) NOT NULL, + `isStudent` TINYINT(1), UNIQUE (email) ) ENGINE = InnoDB DEFAULT CHARSET = utf8; -CREATE TABLE if not exists projectuser - -( - +CREATE TABLE if not exists projectuser ( projectId varchar(100) NOT NULL, - userId varchar(100) NOT NULL - ) - ENGINE = InnoDB - DEFAULT CHARSET = utf8; CREATE TABLE if not exists `annotations` ( @@ -108,44 +74,25 @@ CREATE TABLE if not exists `annotations` ( DEFAULT CHARSET = utf8; alter table users - add isStudent tinyint(1) default '1' null; -CREATE TABLE if not exists quiz - -( - +CREATE TABLE if not exists quiz ( author varchar(400) NOT NULL, - projectId varchar(400) NOT NULL, - question varchar(400) NOT NULL, - mcType varchar(400) NOT NULL, - answer varchar(400) NOT NULL, - correct tinyint(1) NOT NULL - ) - ENGINE = InnoDB - DEFAULT CHARSET = utf8; -CREATE TABLE if not exists tasks - -( - +CREATE TABLE if not exists tasks ( userId varchar(400) NOT NULL, - projectId varchar(400) NOT NULL, - taskUrl varchar(400) NOT NULL ) - ENGINE = InnoDB - DEFAULT CHARSET = utf8; -- GitLab