From 94a569cf34491ea00d539422d8a0b158d65d5ccd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Martin=20St=C3=A4hr?= <software@mstaehr.net>
Date: Thu, 26 Jul 2018 11:24:23 +0200
Subject: [PATCH] #40 fix: dummmy user creation
---
.../src/scripts/dbschema/createDummyUser.sql | 42 +++++++-----------
.../src/scripts/dbschema/fltrail.sql | 44 ++++++++-----------
2 files changed, 36 insertions(+), 50 deletions(-)
diff --git a/gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql b/gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
index e578511f..c68466c5 100644
--- a/gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/createDummyUser.sql
@@ -1,34 +1,26 @@
drop TABLE `users`;
-CREATE TABLE `users` (
- `name` varchar(400) NOT NULL,
- `password` varchar(200) NOT NULL,
- `email` varchar(400) NOT NULL,
- `token` varchar(800) NOT NULL
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+CREATE TABLE if not exists `users` (
+ `name` varchar(100) NOT NULL,
+ `password` varchar(200) NOT NULL,
+ `email` varchar(255) NOT NULL,
+ `token` varchar(800) NOT NULL,
+ `rocketChatId` varchar(400) NOT NULL,
+ `rocketChatAuthToken` varchar(800) NOT NULL,
+ UNIQUE (email)
+)ENGINE = InnoDB DEFAULT CHARSET = utf8;
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent1', 'egal', 'test1@uni.de', 'test1');
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent1', 'egal', 'test1@uni.de', 'test1');
+INSERT INTO `users` (`name`, `password`, `email`, `token`, `rocketChatId`, `rocketChatAuthToken`) VALUES
+ ('teststudent1', 'egal', 'test1@uni.de', 'test1','1','abc');
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent2', 'egal', 'test2@uni.de', 'test2');
+INSERT INTO `users` (`name`, `password`, `email`, `token`, `rocketChatId`, `rocketChatAuthToken`) VALUES
+ ('teststudent1', 'egal', 'test2@uni.de', 'test1','1','abc');
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent3', 'egal', 'test3@uni.de', 'test3');
+INSERT INTO `users` (`name`, `password`, `email`, `token`, `rocketChatId`, `rocketChatAuthToken`) VALUES
+ ('teststudent1', 'egal', 'test3@uni.de', 'test1','1','abc');
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent4', 'egal', 'test4@uni.de', 'test4');
-
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent5', 'egal', 'test5@uni.de', 'test5');
-
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent6', 'egal', 'test6@uni.de', 'test6');
-
-INSERT INTO `users` (`name`, `password`, `email`, `token`) VALUES
- ('teststudent7', 'egal', 'test7@uni.de', 'test7');
+INSERT INTO `users` (`name`, `password`, `email`, `token`, `rocketChatId`, `rocketChatAuthToken`) VALUES
+ ('teststudent1', 'egal', 'test4@uni.de', 'test1','1','abc');
\ No newline at end of file
diff --git a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
index 28f6d308..3ace6f28 100644
--- a/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
+++ b/gemeinsamforschen/src/scripts/dbschema/fltrail.sql
@@ -74,25 +74,16 @@ CREATE TABLE if not exists `tags` (
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists `users` (
-
`name` varchar(100) NOT NULL,
-
`password` varchar(200) NOT NULL,
-
`email` varchar(255) NOT NULL,
-
`token` varchar(800) NOT NULL,
-
`rocketChatId` varchar(400) NOT NULL,
-
`rocketChatAuthToken` varchar(800) NOT NULL,
-
UNIQUE (email)
)
-
ENGINE = InnoDB
-
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists projectuser
@@ -110,16 +101,19 @@ CREATE TABLE if not exists projectuser
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists `annotations` (
- `id` varchar(120) NOT NULL,
- `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- `userToken` varchar(120) DEFAULT NULL,
- `targetId` int(11) DEFAULT NULL,
- `title` varchar(120) DEFAULT NULL,
- `comment` varchar(400) DEFAULT NULL,
- `startCharacter` int(11) DEFAULT NULL,
- `endCharacter` int(11) DEFAULT NULL,
+ `id` varchar(120) NOT NULL,
+ `timestamp` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP
+ ON UPDATE CURRENT_TIMESTAMP,
+ `userToken` varchar(120) DEFAULT NULL,
+ `targetId` int(11) DEFAULT NULL,
+ `title` varchar(120) DEFAULT NULL,
+ `comment` varchar(400) DEFAULT NULL,
+ `startCharacter` int(11) DEFAULT NULL,
+ `endCharacter` int(11) DEFAULT NULL,
PRIMARY KEY (`id`)
-) ENGINE=InnoDB DEFAULT CHARSET=utf8;
+)
+ ENGINE = InnoDB
+ DEFAULT CHARSET = utf8;
alter table users
@@ -164,29 +158,29 @@ CREATE TABLE if not exists tasks
CREATE TABLE if not exists phasesSelected (
- `projectId` varchar(100) NOT NULL,
+ `projectId` varchar(100) NOT NULL,
phaseSelected varchar(200) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists categoriesSelected (
- `projectId` varchar(100) NOT NULL,
- categorySelected varchar(200) NOT NULL
+ `projectId` varchar(100) NOT NULL,
+ categorySelected varchar(200) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists groupfindingMechanismSelected (
- `projectId` varchar(100) NOT NULL,
- gfmSelected varchar(200) NOT NULL
+ `projectId` varchar(100) NOT NULL,
+ gfmSelected varchar(200) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
CREATE TABLE if not exists assessmentMechanismSelected (
- `projectId` varchar(100) NOT NULL,
- amSelected varchar(200) NOT NULL
+ `projectId` varchar(100) NOT NULL,
+ amSelected varchar(200) NOT NULL
)
ENGINE = InnoDB
DEFAULT CHARSET = utf8;
--
GitLab