Fix initialization errors

Updated database initialization to correctly handle differences
between mysql/mariadb syntax and h2 syntax.

Change-Id: I6f2732da5d26201fc61ef8de7d30e3137220c184
Issue-ID: CCSDK-2978
Signed-off-by: Dan Timoney <dtimoney@att.com>

2 files changed, 13 insertions, 12 deletions

diff --git a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_base_tables.sql b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_base_tables.sql
index afb37437..2f47812b 100644
--- a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_base_tables.sql
+++ b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_base_tables.sql
@@ -1,7 +1,7 @@
 --liquibase formatted sql
 --changeset template_table:18_10.create_tables_p1.sql
 
-CREATE TABLE GENERATED_NAME (GENERATED_NAME_ID INTEGER PRIMARY KEY AUTO_INCREMENT(0,100),
+CREATE TABLE GENERATED_NAME (GENERATED_NAME_ID INTEGER PRIMARY KEY AUTO_INCREMENT,
 EXTERNAL_ID VARCHAR(500) NOT NULL COMMENT 'Key sent by SDNC', 
 SEQUNCE_NUMBER INTEGER COMMENT 'Sequence number used for this name',
 SEQUENCE_NUMBER_ENC VARCHAR(100) COMMENT 'Alpha numeric equivalent of sequence_number column',
@@ -13,29 +13,30 @@ IS_RELEASED CHAR(1) COMMENT 'Indicating if the entry is released/unassigned',
 CREATED_TIME DATETIME DEFAULT CURRENT_TIMESTAMP NOT NULL, 
 CREATED_BY VARCHAR(50), 
 LAST_UPDATED_TIME DATETIME, 
-LAST_UPDATED_BY VARCHAR(50));
+LAST_UPDATED_BY VARCHAR(50)
+) AUTO_INCREMENT=100;
 -- COMMENT 'TABLE TO STORE GENERATED NAMES';
 
-CREATE TABLE SERVICE_PARAMETER (SERVICE_PARAMETER_ID INTEGER PRIMARY KEY AUTO_INCREMENT(0,100),
+CREATE TABLE SERVICE_PARAMETER (SERVICE_PARAMETER_ID INTEGER PRIMARY KEY AUTO_INCREMENT,
 NAME VARCHAR(500) NOT NULL COMMENT 'Parameter name',
 VALUE VARCHAR(500) COMMENT 'Parameter value',
 CREATED_TIME DATETIME DEFAULT CURRENT_TIMESTAMP, 
 CREATED_BY VARCHAR(50), 
 LAST_UPDATED_TIME DATETIME, 
 LAST_UPDATED_BY VARCHAR(50)
-);
+) AUTO_INCREMENT=100;
 
-CREATE TABLE IDENTIFIER_MAP (IDENTIFIER_MAP_ID INTEGER PRIMARY KEY AUTO_INCREMENT(0,100),
+CREATE TABLE IDENTIFIER_MAP (IDENTIFIER_MAP_ID INTEGER PRIMARY KEY AUTO_INCREMENT,
 POLICY_FN_NAME VARCHAR(500) COMMENT 'Function name in policy manager' NOT NULL,
 JS_FN_NAME VARCHAR(500) COMMENT 'Equivalent name in Java or script',
 CREATED_TIME DATETIME DEFAULT CURRENT_TIMESTAMP, 
 CREATED_BY VARCHAR(50), 
 LAST_UPDATED_TIME DATETIME, 
 LAST_UPDATED_BY VARCHAR(50)
-);
+) AUTO_INCREMENT=100;
 
 
-CREATE TABLE EXTERNAL_INTERFACE (EXTERNAL_INTERFACE_ID INTEGER PRIMARY KEY AUTO_INCREMENT(0,100),
+CREATE TABLE EXTERNAL_INTERFACE (EXTERNAL_INTERFACE_ID INTEGER PRIMARY KEY AUTO_INCREMENT,
 SYSTEM VARCHAR(500) COMMENT 'Name of the external system',
 PARAM VARCHAR(500) COMMENT 'Parameters controlling the url',
 URL_SUFFIX VARCHAR(500) COMMENT 'The suffix of the URL for each value of the parameter',
@@ -43,10 +44,10 @@ CREATED_TIME DATETIME DEFAULT CURRENT_TIMESTAMP,
 CREATED_BY VARCHAR(50), 
 LAST_UPDATED_TIME DATETIME, 
 LAST_UPDATED_BY VARCHAR(50)
-);
+) AUTO_INCREMENT=100;
 
-CREATE TABLE POLICY_MAN_SIM (POLICY_ID INTEGER PRIMARY KEY AUTO_INCREMENT(0,100),
+CREATE TABLE POLICY_MAN_SIM (POLICY_ID INTEGER PRIMARY KEY AUTO_INCREMENT,
 POLICY_NAME VARCHAR(500) COMMENT 'Policy name' NOT NULL,
 POLICY_RESPONSE VARCHAR(10000) COMMENT 'Policy value',
 CREATED_TIME DATETIME DEFAULT CURRENT_TIMESTAMP
-);
+) AUTO_INCREMENT=100;
diff --git a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_message_table.sql b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_message_table.sql
index 33b42434..643f4c02 100644
--- a/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_message_table.sql
+++ b/ms/neng/src/main/resources/db/changelog/scripts/rel_18_10/create_message_table.sql
@@ -8,7 +8,7 @@ SERVICE_NAME VARCHAR(100) COMMENT 'Service name',
 START_TIME DATETIME DEFAULT CURRENT_TIMESTAMP COMMENT 'Transaction start time', 
 ELAPSED_MILLIS INTEGER ,
 STATUS VARCHAR(20) COMMENT 'Transaction status', 
-REQUEST VARCHAR(10000) NOT NULL COMMENT 'Request JSON',
-RESPONSE VARCHAR(20000) COMMENT 'Request JSON', 
+REQUEST LONGTEXT NOT NULL COMMENT 'Request JSON',
+RESPONSE LONGTEXT COMMENT 'Request JSON', 
 REQUESTER VARCHAR(50) COMMENT 'Requester'
 );