From ee0af76696f0c124e7826822cc890eefd138ea0f Mon Sep 17 00:00:00 2001
From: Andrew Iskander <andrew.iskander@utah.edu>
Date: Thu, 11 May 2017 10:51:05 -0600
Subject: [PATCH] Fixing database creation scripts

---
 .../dbScripts/profile_black_list.sql            | 13 +++++++------
 .../dbScripts/userAuthentication.sql            | 17 ++++++++++++-----
 .../dbScripts/valueset_and_log.sql              |  3 ++-
 3 files changed, 21 insertions(+), 12 deletions(-)

diff --git a/DeploymentPackage/dbScripts/profile_black_list.sql b/DeploymentPackage/dbScripts/profile_black_list.sql
index 150afce0..db4b7cac 100644
--- a/DeploymentPackage/dbScripts/profile_black_list.sql
+++ b/DeploymentPackage/dbScripts/profile_black_list.sql
@@ -1,9 +1,10 @@
-use resource_profile;
-CREATE TABLE resource_profile.profile_black_list
+USE `resource_profile`;
+
+CREATE TABLE `profile_black_list`
 (
-id INT PRIMARY KEY NOT NULL AUTO_INCREMENT,
-profileTitle VARCHAR(100) NOT NULL,
-userId VARCHAR(20) NOT NULL,
-profileID INT(11)
+`id` BIGINT PRIMARY KEY NOT NULL AUTO_INCREMENT,
+`profileTitle` VARCHAR(100) NOT NULL,
+`userId` VARCHAR(20) NOT NULL,
+`profileID` INT(11)
 );
 CREATE UNIQUE INDEX profile_black_list_id_uindex ON resource_profile.profile_black_list (id);
diff --git a/DeploymentPackage/dbScripts/userAuthentication.sql b/DeploymentPackage/dbScripts/userAuthentication.sql
index 477750a1..487b483b 100644
--- a/DeploymentPackage/dbScripts/userAuthentication.sql
+++ b/DeploymentPackage/dbScripts/userAuthentication.sql
@@ -1,6 +1,13 @@
-CREATE TABLE users
+USE `resource_profile`;
+
+DROP TABLE IF EXISTS `users`;
+
+CREATE TABLE `users`
 (
-    username VARCHAR(45) PRIMARY KEY NOT NULL,
-    password VARCHAR(45) NOT NULL,
-    role VARCHAR(12)
-);
\ No newline at end of file
+    `username` VARCHAR(45) PRIMARY KEY NOT NULL,
+    `password` VARCHAR(45) NOT NULL,
+    `role` VARCHAR(12)
+);
+
+INSERT INTO `users` (`username`, `password`, `role`) VALUES ('root', 'password', 'ADMIN');
+
diff --git a/DeploymentPackage/dbScripts/valueset_and_log.sql b/DeploymentPackage/dbScripts/valueset_and_log.sql
index edb8a7d5..ebb693cc 100644
--- a/DeploymentPackage/dbScripts/valueset_and_log.sql
+++ b/DeploymentPackage/dbScripts/valueset_and_log.sql
@@ -20,7 +20,7 @@ USE `valueset_and_log`;
 DROP TABLE IF EXISTS `subset_json`;
 /*!40101 SET @saved_cs_client     = @@character_set_client */;
 /*!40101 SET character_set_client = utf8 */;
-CREATE TABLE `valueset_and_log`.`subset_json`
+CREATE TABLE `subset_json`
 (
   `id` INT(11) PRIMARY KEY NOT NULL,
   `last_updated` TIMESTAMP NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
@@ -38,5 +38,6 @@ CREATE TABLE `logs` (
   `timestamp` timestamp NOT NULL default CURRENT_TIMESTAMP on update CURRENT_TIMESTAMP,
   `clientIP` varchar(45) NOT NULL,
   `orgID` varchar(45) NOT NULL,
+  `response` mediumtext NULL
   PRIMARY KEY  (`logsId`)
 ) ENGINE=MyISAM AUTO_INCREMENT=106 DEFAULT CHARSET=latin1;
\ No newline at end of file