#2021 fix - Added MySQL support and bugfixing on angular and url's

rsanchez

2014-11-14 1371dd17f28f3342d02383df8f80e152c0cdd995

 securis/src/main/resources/db/schema.sql
..
..
@@ -1,9 +1,10 @@
1
+
1
2
 drop table IF EXISTS settings;
2
3
 CREATE  TABLE IF NOT EXISTS settings (
3
-  key VARCHAR(100) NOT NULL ,
4
+  `key` VARCHAR(100) NOT NULL ,
4
5
   value VARCHAR(2000) NULL ,
5
-  timestamp DATETIME NOT NULL DEFAULT now() ,
6
-  PRIMARY KEY (key) );
6
+  creation_timestamp DATETIME NOT NULL default now(),  
7
+  PRIMARY KEY (``key``) );
7
8
  
8
9
 drop table IF EXISTS user;
9
10
 CREATE  TABLE IF NOT EXISTS user (
..
..
@@ -15,7 +16,7 @@
15
16
   last_login DATETIME NULL ,
16
17
   lang VARCHAR(10) NULL ,
17
18
   email VARCHAR(150) NULL ,
18
-  creation_timestamp DATETIME NULL ,  
19
+  creation_timestamp DATETIME NOT NULL default now(),  
19
20
   modification_timestamp DATETIME NULL ,  
20
21
   PRIMARY KEY (username));
21
22
 
..
..
@@ -25,17 +26,17 @@
25
26
   name VARCHAR(45) NOT NULL ,
26
27
   license_filename VARCHAR(100) NOT NULL ,
27
28
   description VARCHAR(500) NULL ,
28
-  creation_timestamp DATETIME NULL ,  
29
+  creation_timestamp DATETIME NOT NULL default now(),  
29
30
   PRIMARY KEY (id));
30
31
 
31
32
 drop table IF EXISTS application_metadata;
32
33
 CREATE TABLE IF NOT EXISTS application_metadata (
33
34
   application_id INT NOT NULL ,
34
-  key VARCHAR(100) NOT NULL ,
35
+  `key` VARCHAR(100) NOT NULL ,
35
36
   value VARCHAR(200) NULL ,
36
37
   mandatory BOOLEAN NOT NULL default true,
37
-  creation_timestamp DATETIME NOT NULL ,  
38
-  PRIMARY KEY (application_id, key));
38
+  creation_timestamp DATETIME NOT NULL default now(),  
39
+  PRIMARY KEY (application_id, `key`));
39
40
 
40
41
 
41
42
 drop table IF EXISTS license_type;
..
..
@@ -45,16 +46,16 @@
45
46
   name VARCHAR(45) NOT NULL ,
46
47
   description VARCHAR(100) NULL ,
47
48
   application_id INT NULL ,
48
-  creation_timestamp DATETIME NULL ,  
49
+  creation_timestamp DATETIME NOT NULL default now(),  
49
50
   PRIMARY KEY (id));
50
51
 
51
52
 drop table IF EXISTS licensetype_metadata;
52
53
 CREATE TABLE IF NOT EXISTS licensetype_metadata (
53
54
   license_type_id INT NOT NULL ,
54
-  key VARCHAR(100) NOT NULL ,
55
+  `key` VARCHAR(100) NOT NULL ,
55
56
   value VARCHAR(200) NULL ,
56
57
   mandatory BOOLEAN NOT NULL default true,
57
-  PRIMARY KEY (license_type_id, key));
58
+  PRIMARY KEY (license_type_id, `key`));
58
59
 
59
60
 drop table IF EXISTS organization;
60
61
 CREATE  TABLE IF NOT EXISTS organization (
..
..
@@ -63,7 +64,7 @@
63
64
   name VARCHAR(45) NOT NULL ,
64
65
   description VARCHAR(100) NULL ,
65
66
   org_parent_id INT NULL ,
66
-  creation_timestamp DATETIME NULL ,  
67
+  creation_timestamp DATETIME NOT NULL default now(),  
67
68
   PRIMARY KEY (id));
68
69
   
69
70
 drop table IF EXISTS user_organization;
..
..
@@ -77,8 +78,8 @@
77
78
   id INT NOT NULL auto_increment,
78
79
   code VARCHAR(50) NOT NULL ,
79
80
   num_licenses INT NOT NULL ,
80
-  init_valid_date DATE NOT NULL default today(),
81
-  end_valid_date DATE NOT NULL default today(),
81
+  init_valid_date DATE NOT NULL,
82
+  end_valid_date DATE NOT NULL,
82
83
   status VARCHAR(2) NOT NULL default 'CR',
83
84
   comments VARCHAR(1024) NULL ,
84
85
   license_type_id INT NOT NULL,  
..
..
@@ -86,17 +87,17 @@
86
87
   license_preactivation BOOLEAN NOT NULL DEFAULT true,  
87
88
   default_valid_period INT NOT NULL DEFAULT 60,  
88
89
   created_by varchar(45) NULL ,  
89
-  creation_timestamp DATETIME NOT NULL ,  
90
+  creation_timestamp DATETIME NOT NULL default now(),
90
91
   PRIMARY KEY (id));
91
92
   
92
93
 drop table IF EXISTS pack_metadata;
93
94
 CREATE TABLE IF NOT EXISTS pack_metadata (
94
95
   pack_id INT NOT NULL ,
95
-  key VARCHAR(100) NOT NULL ,
96
+  `key` VARCHAR(100) NOT NULL ,
96
97
   value VARCHAR(200) NULL ,
97
98
   readonly BOOlEAN NOT NULL default false,
98
99
   mandatory BOOLEAN NOT NULL default true,
99
-  PRIMARY KEY (pack_id, key));
100
+  PRIMARY KEY (pack_id, `key`));
100
101
   
101
102
   
102
103
 drop table IF EXISTS license;
..
..
@@ -110,24 +111,22 @@
110
111
   full_name VARCHAR(150) NULL,  
111
112
   email VARCHAR(100)  NOT NULL,  
112
113
   comments VARCHAR(1024) NULL ,
113
-  creation_timestamp DATETIME NOT NULL ,  
114
+  creation_timestamp DATETIME NOT NULL default now(),  
114
115
   modification_timestamp DATETIME NULL ,  
115
116
   last_access_timestamp DATETIME NULL ,  
116
117
   expiration_date DATETIME NULL ,  
117
118
   cancelled_by varchar(45) NULL ,  
118
119
   created_by varchar(45) NULL ,  
119
120
   status VARCHAR(2) NOT NULL default 'CR',  
120
-  PRIMARY KEY (id));
121
-
122
-create index if not exists lic_hash_req_idx on license(request_data_hash);  
123
-create index if not exists lic_pack_idx on license(pack_id);  
121
+  PRIMARY KEY (id),
122
+  index(request_data_hash, pack_id));
124
123
   
125
124
 drop table IF EXISTS license_history;
126
125
 CREATE TABLE IF NOT EXISTS license_history (
127
126
   id INT NOT NULL auto_increment,
128
127
   license_id INT NOT NULL,
129
128
   username VARCHAR(45) NOT NULL,
130
-  timestamp DATETIME NOT NULL ,
129
+  creation_timestamp DATETIME NOT NULL default now(),  
131
130
   action VARCHAR(40) , 
132
131
   comments VARCHAR(512) ,
133
132
   PRIMARY KEY (id));