From 1371dd17f28f3342d02383df8f80e152c0cdd995 Mon Sep 17 00:00:00 2001
From: rsanchez <rsanchez@curisit.net>
Date: Fri, 14 Nov 2014 18:21:35 +0000
Subject: [PATCH] #2021 fix - Added MySQL support and bugfixing on angular and url's

---
 securis/src/main/resources/db/schema.sql |   45 ++++++++++++++++++++++-----------------------
 1 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/securis/src/main/resources/db/schema.sql b/securis/src/main/resources/db/schema.sql
index cac2f67..4f69276 100644
--- a/securis/src/main/resources/db/schema.sql
+++ b/securis/src/main/resources/db/schema.sql
@@ -1,9 +1,10 @@
+
 drop table IF EXISTS settings;
 CREATE  TABLE IF NOT EXISTS settings (
-  key VARCHAR(100) NOT NULL ,
+  `key` VARCHAR(100) NOT NULL ,
   value VARCHAR(2000) NULL ,
-  timestamp DATETIME NOT NULL DEFAULT now() ,
-  PRIMARY KEY (key) );
+  creation_timestamp DATETIME NOT NULL default now(),  
+  PRIMARY KEY (``key``) );
  
 drop table IF EXISTS user;
 CREATE  TABLE IF NOT EXISTS user (
@@ -15,7 +16,7 @@
   last_login DATETIME NULL ,
   lang VARCHAR(10) NULL ,
   email VARCHAR(150) NULL ,
-  creation_timestamp DATETIME NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),  
   modification_timestamp DATETIME NULL ,  
   PRIMARY KEY (username));
 
@@ -25,17 +26,17 @@
   name VARCHAR(45) NOT NULL ,
   license_filename VARCHAR(100) NOT NULL ,
   description VARCHAR(500) NULL ,
-  creation_timestamp DATETIME NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),  
   PRIMARY KEY (id));
 
 drop table IF EXISTS application_metadata;
 CREATE TABLE IF NOT EXISTS application_metadata (
   application_id INT NOT NULL ,
-  key VARCHAR(100) NOT NULL ,
+  `key` VARCHAR(100) NOT NULL ,
   value VARCHAR(200) NULL ,
   mandatory BOOLEAN NOT NULL default true,
-  creation_timestamp DATETIME NOT NULL ,  
-  PRIMARY KEY (application_id, key));
+  creation_timestamp DATETIME NOT NULL default now(),  
+  PRIMARY KEY (application_id, `key`));
 
 
 drop table IF EXISTS license_type;
@@ -45,16 +46,16 @@
   name VARCHAR(45) NOT NULL ,
   description VARCHAR(100) NULL ,
   application_id INT NULL ,
-  creation_timestamp DATETIME NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),  
   PRIMARY KEY (id));
 
 drop table IF EXISTS licensetype_metadata;
 CREATE TABLE IF NOT EXISTS licensetype_metadata (
   license_type_id INT NOT NULL ,
-  key VARCHAR(100) NOT NULL ,
+  `key` VARCHAR(100) NOT NULL ,
   value VARCHAR(200) NULL ,
   mandatory BOOLEAN NOT NULL default true,
-  PRIMARY KEY (license_type_id, key));
+  PRIMARY KEY (license_type_id, `key`));
 
 drop table IF EXISTS organization;
 CREATE  TABLE IF NOT EXISTS organization (
@@ -63,7 +64,7 @@
   name VARCHAR(45) NOT NULL ,
   description VARCHAR(100) NULL ,
   org_parent_id INT NULL ,
-  creation_timestamp DATETIME NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),  
   PRIMARY KEY (id));
   
 drop table IF EXISTS user_organization;
@@ -77,8 +78,8 @@
   id INT NOT NULL auto_increment,
   code VARCHAR(50) NOT NULL ,
   num_licenses INT NOT NULL ,
-  init_valid_date DATE NOT NULL default today(),
-  end_valid_date DATE NOT NULL default today(),
+  init_valid_date DATE NOT NULL,
+  end_valid_date DATE NOT NULL,
   status VARCHAR(2) NOT NULL default 'CR',
   comments VARCHAR(1024) NULL ,
   license_type_id INT NOT NULL,  
@@ -86,17 +87,17 @@
   license_preactivation BOOLEAN NOT NULL DEFAULT true,  
   default_valid_period INT NOT NULL DEFAULT 60,  
   created_by varchar(45) NULL ,  
-  creation_timestamp DATETIME NOT NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),
   PRIMARY KEY (id));
   
 drop table IF EXISTS pack_metadata;
 CREATE TABLE IF NOT EXISTS pack_metadata (
   pack_id INT NOT NULL ,
-  key VARCHAR(100) NOT NULL ,
+  `key` VARCHAR(100) NOT NULL ,
   value VARCHAR(200) NULL ,
   readonly BOOlEAN NOT NULL default false,
   mandatory BOOLEAN NOT NULL default true,
-  PRIMARY KEY (pack_id, key));
+  PRIMARY KEY (pack_id, `key`));
   
   
 drop table IF EXISTS license;
@@ -110,24 +111,22 @@
   full_name VARCHAR(150) NULL,  
   email VARCHAR(100)  NOT NULL,  
   comments VARCHAR(1024) NULL ,
-  creation_timestamp DATETIME NOT NULL ,  
+  creation_timestamp DATETIME NOT NULL default now(),  
   modification_timestamp DATETIME NULL ,  
   last_access_timestamp DATETIME NULL ,  
   expiration_date DATETIME NULL ,  
   cancelled_by varchar(45) NULL ,  
   created_by varchar(45) NULL ,  
   status VARCHAR(2) NOT NULL default 'CR',  
-  PRIMARY KEY (id));
-
-create index if not exists lic_hash_req_idx on license(request_data_hash);  
-create index if not exists lic_pack_idx on license(pack_id);  
+  PRIMARY KEY (id),
+  index(request_data_hash, pack_id));
   
 drop table IF EXISTS license_history;
 CREATE TABLE IF NOT EXISTS license_history (
   id INT NOT NULL auto_increment,
   license_id INT NOT NULL,
   username VARCHAR(45) NOT NULL,
-  timestamp DATETIME NOT NULL ,
+  creation_timestamp DATETIME NOT NULL default now(),  
   action VARCHAR(40) , 
   comments VARCHAR(512) ,
   PRIMARY KEY (id));

--
Gitblit v1.3.2