airavata-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From machris...@apache.org
Subject [airavata] branch airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code updated: AIRAVATA-2938 explicitly set CHARACTER SET on all tables
Date Thu, 24 Jan 2019 16:25:13 GMT
This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/airavata-2938-change-db-initialization-in-registry-server-to-use-registry-refactoring-code
by this push:
     new b9d3b36  AIRAVATA-2938 explicitly set CHARACTER SET on all tables
b9d3b36 is described below

commit b9d3b36efb64af08a65cf9a88cc71b728fc46642
Author: Marcus Christie <machristie@apache.org>
AuthorDate: Thu Jan 24 11:24:56 2019 -0500

    AIRAVATA-2938 explicitly set CHARACTER SET on all tables
---
 .../src/main/resources/appcatalog-mysql.sql        | 97 +++++++++++-----------
 .../src/main/resources/expcatalog-mysql.sql        | 50 +++++------
 .../src/main/resources/replicacatalog-mysql.sql    | 10 +--
 3 files changed, 79 insertions(+), 78 deletions(-)

diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
index 88dc5ea..f934a90 100644
--- a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
@@ -37,7 +37,7 @@ CREATE TABLE COMPUTE_RESOURCE
           GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500),
           GATEWAY_USAGE_EXECUTABLE VARCHAR(255),
           PRIMARY KEY (RESOURCE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE HOST_ALIAS
 (
@@ -45,7 +45,7 @@ CREATE TABLE HOST_ALIAS
          ALIAS VARCHAR(255),
          PRIMARY KEY(RESOURCE_ID,ALIAS),
          FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE HOST_IPADDRESS
 (
@@ -53,7 +53,7 @@ CREATE TABLE HOST_IPADDRESS
          IP_ADDRESS VARCHAR(255),
          PRIMARY KEY(RESOURCE_ID,IP_ADDRESS),
          FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GSISSH_SUBMISSION
 (
@@ -63,7 +63,7 @@ CREATE TABLE GSISSH_SUBMISSION
          INSTALLED_PATH VARCHAR(255),
          MONITOR_MODE VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GSISSH_EXPORT
 (
@@ -71,7 +71,7 @@ CREATE TABLE GSISSH_EXPORT
          EXPORT VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID, EXPORT),
          FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GSISSH_PREJOBCOMMAND
 (
@@ -79,7 +79,7 @@ CREATE TABLE GSISSH_PREJOBCOMMAND
          COMMAND VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID, COMMAND),
          FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GSISSH_POSTJOBCOMMAND
 (
@@ -87,7 +87,7 @@ CREATE TABLE GSISSH_POSTJOBCOMMAND
          COMMAND VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID, COMMAND),
          FOREIGN KEY (SUBMISSION_ID) REFERENCES GSISSH_SUBMISSION(SUBMISSION_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GLOBUS_SUBMISSION
 (
@@ -95,14 +95,15 @@ CREATE TABLE GLOBUS_SUBMISSION
          RESOURCE_JOB_MANAGER VARCHAR(255),
          SECURITY_PROTOCAL VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
 CREATE TABLE UNICORE_SUBMISSION
 (
          SUBMISSION_ID VARCHAR(255),
          SECURITY_PROTOCAL VARCHAR(255),
          UNICORE_ENDPOINT_URL VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE UNICORE_DATAMOVEMENT
 (
@@ -110,7 +111,7 @@ CREATE TABLE UNICORE_DATAMOVEMENT
          SECURITY_PROTOCOL VARCHAR(255),
          UNICORE_ENDPOINT_URL VARCHAR(255),
          PRIMARY KEY(DATAMOVEMENT_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GLOBUS_GK_ENDPOINT
 (
@@ -118,7 +119,7 @@ CREATE TABLE GLOBUS_GK_ENDPOINT
          ENDPOINT VARCHAR(255),
          PRIMARY KEY(SUBMISSION_ID, ENDPOINT),
          FOREIGN KEY (SUBMISSION_ID) REFERENCES GLOBUS_SUBMISSION(SUBMISSION_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE RESOURCE_JOB_MANAGER
 (
@@ -129,7 +130,7 @@ CREATE TABLE RESOURCE_JOB_MANAGER
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (RESOURCE_JOB_MANAGER_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE SSH_JOB_SUBMISSION
 (
@@ -143,7 +144,7 @@ CREATE TABLE SSH_JOB_SUBMISSION
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
         PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
         FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE SCP_DATA_MOVEMENT
 (
@@ -155,7 +156,7 @@ CREATE TABLE SCP_DATA_MOVEMENT
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
         PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GRIDFTP_DATA_MOVEMENT
 (
@@ -164,7 +165,7 @@ CREATE TABLE GRIDFTP_DATA_MOVEMENT
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
         PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GRIDFTP_ENDPOINT
 (
@@ -174,7 +175,7 @@ CREATE TABLE GRIDFTP_ENDPOINT
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
         FOREIGN KEY (DATA_MOVEMENT_INTERFACE_ID) REFERENCES GRIDFTP_DATA_MOVEMENT(DATA_MOVEMENT_INTERFACE_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 --CREATE TABLE JOB_SUBMISSION_PROTOCOL
 --(
@@ -204,7 +205,7 @@ CREATE TABLE APPLICATION_MODULE
          CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
          UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
          PRIMARY KEY(MODULE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APPLICATION_DEPLOYMENT
 (
@@ -226,7 +227,7 @@ CREATE TABLE APPLICATION_DEPLOYMENT
          PRIMARY KEY(DEPLOYMENT_ID),
          FOREIGN KEY (COMPUTE_HOSTID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE,
          FOREIGN KEY (APP_MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE MODULE_LOAD_CMD
 (
@@ -235,7 +236,7 @@ CREATE TABLE MODULE_LOAD_CMD
         COMMAND_ORDER INTEGER,
         PRIMARY KEY (APP_DEPLOYMENT_ID,CMD),
         FOREIGN KEY (APP_DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PREJOB_COMMAND
 (
@@ -244,7 +245,7 @@ CREATE TABLE PREJOB_COMMAND
          COMMAND_ORDER INTEGER,
          PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
          FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE POSTJOB_COMMAND
 (
@@ -253,7 +254,7 @@ CREATE TABLE POSTJOB_COMMAND
          COMMAND_ORDER INTEGER,
          PRIMARY KEY(APPDEPLOYMENT_ID, COMMAND),
          FOREIGN KEY (APPDEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE LIBRARY_PREPAND_PATH
 (
@@ -262,7 +263,7 @@ CREATE TABLE LIBRARY_PREPAND_PATH
          VALUE VARCHAR(255),
          PRIMARY KEY(DEPLOYMENT_ID, NAME),
          FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON
DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE LIBRARY_APEND_PATH
 (
@@ -271,7 +272,7 @@ CREATE TABLE LIBRARY_APEND_PATH
          VALUE VARCHAR(255),
          PRIMARY KEY(DEPLOYMENT_ID, NAME),
          FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON
DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APP_ENVIRONMENT
 (
@@ -281,7 +282,7 @@ CREATE TABLE APP_ENVIRONMENT
          ENV_ORDER INTEGER,
          PRIMARY KEY(DEPLOYMENT_ID, NAME),
          FOREIGN KEY (DEPLOYMENT_ID) REFERENCES APPLICATION_DEPLOYMENT(DEPLOYMENT_ID) ON
DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APPLICATION_INTERFACE
 (
@@ -294,7 +295,7 @@ CREATE TABLE APPLICATION_INTERFACE
          CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
          UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
          PRIMARY KEY(INTERFACE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APP_MODULE_MAPPING
 (
@@ -303,7 +304,7 @@ CREATE TABLE APP_MODULE_MAPPING
          PRIMARY KEY(INTERFACE_ID, MODULE_ID),
          FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE
CASCADE,
          FOREIGN KEY (MODULE_ID) REFERENCES APPLICATION_MODULE(MODULE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APPLICATION_INPUT
 (
@@ -322,7 +323,7 @@ CREATE TABLE APPLICATION_INPUT
          IS_READ_ONLY SMALLINT,
          PRIMARY KEY(INTERFACE_ID,INPUT_KEY),
          FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE APPLICATION_OUTPUT
 (
@@ -339,7 +340,7 @@ CREATE TABLE APPLICATION_OUTPUT
          OUTPUT_STREAMING SMALLINT,
          PRIMARY KEY(INTERFACE_ID,OUTPUT_KEY),
          FOREIGN KEY (INTERFACE_ID) REFERENCES APPLICATION_INTERFACE(INTERFACE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GATEWAY_PROFILE
 (
@@ -350,7 +351,7 @@ CREATE TABLE GATEWAY_PROFILE
          IDENTITY_SERVER_TENANT VARCHAR (255),
          IDENTITY_SERVER_PWD_CRED_TOKEN VARCHAR (255),
          PRIMARY KEY(GATEWAY_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
 (
@@ -374,7 +375,7 @@ CREATE TABLE COMPUTE_RESOURCE_PREFERENCE
         PRIMARY KEY(GATEWAY_ID,RESOURCE_ID),
         FOREIGN KEY (RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE CASCADE,
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE SSH_ACCOUNT_PROVISIONER_CONFIG
 (
@@ -384,7 +385,7 @@ CREATE TABLE SSH_ACCOUNT_PROVISIONER_CONFIG
         CONFIG_VALUE VARCHAR(255),
         PRIMARY KEY (GATEWAY_ID, RESOURCE_ID, CONFIG_NAME),
         FOREIGN KEY (GATEWAY_ID, RESOURCE_ID) REFERENCES COMPUTE_RESOURCE_PREFERENCE (GATEWAY_ID,
RESOURCE_ID) ON DELETE CASCADE
-) ENGINE=MyISAM DEFAULT CHARSET=latin1;
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE BATCH_QUEUE
 (
@@ -404,7 +405,7 @@ CREATE TABLE BATCH_QUEUE
         IS_DEFAULT_QUEUE TINYINT(1),
         PRIMARY KEY (COMPUTE_RESOURCE_ID,QUEUE_NAME),
         FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
 (
@@ -413,7 +414,7 @@ CREATE TABLE COMPUTE_RESOURCE_FILE_SYSTEM
         FILE_SYSTEM VARCHAR (255) NOT NULL,
         PRIMARY KEY (COMPUTE_RESOURCE_ID,FILE_SYSTEM),
         FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE JOB_SUBMISSION_INTERFACE
 (
@@ -425,7 +426,7 @@ CREATE TABLE JOB_SUBMISSION_INTERFACE
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (COMPUTE_RESOURCE_ID,JOB_SUBMISSION_INTERFACE_ID),
         FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
  
 CREATE TABLE DATA_MOVEMENT_INTERFACE
 (
@@ -437,7 +438,7 @@ CREATE TABLE DATA_MOVEMENT_INTERFACE
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (COMPUTE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
         FOREIGN KEY (COMPUTE_RESOURCE_ID) REFERENCES COMPUTE_RESOURCE(RESOURCE_ID) ON DELETE
CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE STORAGE_RESOURCE
 (
@@ -448,7 +449,7 @@ CREATE TABLE STORAGE_RESOURCE
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (STORAGE_RESOURCE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE STORAGE_INTERFACE
 (
@@ -460,7 +461,7 @@ CREATE TABLE STORAGE_INTERFACE
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (STORAGE_RESOURCE_ID,DATA_MOVEMENT_INTERFACE_ID),
         FOREIGN KEY (STORAGE_RESOURCE_ID) REFERENCES STORAGE_RESOURCE(STORAGE_RESOURCE_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE JOB_MANAGER_COMMAND
 (
@@ -469,7 +470,7 @@ CREATE TABLE JOB_MANAGER_COMMAND
         COMMAND VARCHAR (255),
         PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
         FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PARALLELISM_COMMAND
 (
@@ -478,7 +479,7 @@ CREATE TABLE PARALLELISM_COMMAND
         COMMAND VARCHAR (255),
         PRIMARY KEY (RESOURCE_JOB_MANAGER_ID,COMMAND_TYPE),
         FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE LOCAL_SUBMISSION
 (
@@ -489,13 +490,13 @@ CREATE TABLE LOCAL_SUBMISSION
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID),
         FOREIGN KEY (RESOURCE_JOB_MANAGER_ID) REFERENCES RESOURCE_JOB_MANAGER(RESOURCE_JOB_MANAGER_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE LOCAL_DATA_MOVEMENT
 (
         DATA_MOVEMENT_INTERFACE_ID VARCHAR (255) NOT NULL,
         PRIMARY KEY (DATA_MOVEMENT_INTERFACE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE DATA_STORAGE_PREFERENCE
 (
@@ -506,7 +507,7 @@ CREATE TABLE DATA_STORAGE_PREFERENCE
         RESOURCE_CS_TOKEN VARCHAR(255),
         PRIMARY KEY(GATEWAY_ID,STORAGE_RESOURCE_ID),
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY_PROFILE(GATEWAY_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE WORKFLOW
 (
@@ -518,7 +519,7 @@ CREATE TABLE WORKFLOW
         UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
         IMAGE BLOB,
         PRIMARY KEY (WF_TEMPLATE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE WORKFLOW_INPUT
 (
@@ -532,7 +533,7 @@ CREATE TABLE WORKFLOW_INPUT
          USER_FRIENDLY_DESC VARCHAR(255),
          PRIMARY KEY(WF_TEMPLATE_ID,INPUT_KEY),
          FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE WORKFLOW_OUTPUT
 (
@@ -542,7 +543,7 @@ CREATE TABLE WORKFLOW_OUTPUT
          DATA_TYPE VARCHAR(255),
          PRIMARY KEY(WF_TEMPLATE_ID,OUTPUT_KEY),
          FOREIGN KEY (WF_TEMPLATE_ID) REFERENCES WORKFLOW(WF_TEMPLATE_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE USER_RESOURCE_PROFILE (
   USER_ID varchar(255) NOT NULL,
@@ -743,7 +744,7 @@ CREATE TABLE GATEWAY_GROUPS
   READ_ONLY_ADMINS_GROUP_ID VARCHAR(255),
   DEFAULT_GATEWAY_USERS_GROUP_ID VARCHAR(255),
   PRIMARY KEY(GATEWAY_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE CLOUD_JOB_SUBMISSION (
   JOB_SUBMISSION_INTERFACE_ID varchar(255) NOT NULL,
@@ -753,14 +754,14 @@ CREATE TABLE CLOUD_JOB_SUBMISSION (
   SECURITY_PROTOCOL VARCHAR(255) DEFAULT NULL,
   USER_ACCOUNT_NAME VARCHAR(255) DEFAULT NULL,
   PRIMARY KEY (JOB_SUBMISSION_INTERFACE_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE CONFIGURATION
 (
           CONFIG_KEY VARCHAR(255),
           CONFIG_VAL VARCHAR(255),
           PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('app_catalog_version', '0.16');
 
diff --git a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
index 36cae1f..45e9a04 100644
--- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql
@@ -42,7 +42,7 @@ CREATE TABLE GATEWAY
         REQUEST_CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
         REQUESTER_USERNAME VARCHAR(255),
         PRIMARY KEY (GATEWAY_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE NOTIFICATION
 (
@@ -55,7 +55,7 @@ CREATE TABLE NOTIFICATION
 	      EXPIRATION_DATE TIMESTAMP,
 	      CREATION_DATE TIMESTAMP,
         PRIMARY KEY (NOTIFICATION_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE USERS
 (
@@ -65,7 +65,7 @@ CREATE TABLE USERS
         GATEWAY_ID VARCHAR(255) NOT NULL,
         PRIMARY KEY (GATEWAY_ID, USER_NAME),
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE GATEWAY_WORKER
 (
@@ -73,7 +73,7 @@ CREATE TABLE GATEWAY_WORKER
         USER_NAME VARCHAR(255),
         PRIMARY KEY (GATEWAY_ID, USER_NAME),
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PROJECT
 (
@@ -85,7 +85,7 @@ CREATE TABLE PROJECT
         CREATION_TIME TIMESTAMP DEFAULT NOW(),
         PRIMARY KEY (PROJECT_ID),
         FOREIGN KEY (GATEWAY_ID) REFERENCES GATEWAY(GATEWAY_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PROJECT_USER
 (
@@ -93,7 +93,7 @@ CREATE TABLE PROJECT_USER
         USER_NAME VARCHAR(255) NOT NULL,
         PRIMARY KEY (PROJECT_ID,USER_NAME),
         FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE EXPERIMENT (
         EXPERIMENT_ID varchar(255),
@@ -111,7 +111,7 @@ CREATE TABLE EXPERIMENT (
         EMAIL_ADDRESSES text,
         PRIMARY KEY (EXPERIMENT_ID),
         FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE EXPERIMENT_INPUT
@@ -132,7 +132,7 @@ CREATE TABLE EXPERIMENT_INPUT
         IS_READ_ONLY SMALLINT,
         PRIMARY KEY(EXPERIMENT_ID,INPUT_NAME),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE EXPERIMENT_OUTPUT
 (
@@ -150,7 +150,7 @@ CREATE TABLE EXPERIMENT_OUTPUT
         STORAGE_RESOURCE_ID varchar(255),
         PRIMARY KEY(EXPERIMENT_ID,OUTPUT_NAME),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE EXPERIMENT_STATUS (
@@ -161,7 +161,7 @@ CREATE TABLE EXPERIMENT_STATUS (
         REASON LONGTEXT,
         PRIMARY KEY (STATUS_ID, EXPERIMENT_ID),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE EXPERIMENT_ERROR (
@@ -174,7 +174,7 @@ CREATE TABLE EXPERIMENT_ERROR (
         ROOT_CAUSE_ERROR_ID_LIST text,
         PRIMARY KEY (ERROR_ID, EXPERIMENT_ID),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE USER_CONFIGURATION_DATA (
         EXPERIMENT_ID varchar(255) NOT NULL,
@@ -201,7 +201,7 @@ CREATE TABLE USER_CONFIGURATION_DATA (
         IS_USE_USER_CR_PREF TINYINT(1),
         PRIMARY KEY (EXPERIMENT_ID),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE VIEW LATEST_EXPERIMENT_STATUS AS
@@ -240,7 +240,7 @@ CREATE TABLE PROCESS (
         USE_USER_CR_PREF TINYINT(1),
         PRIMARY KEY (PROCESS_ID),
         FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PROCESS_INPUT
 (
@@ -260,7 +260,7 @@ CREATE TABLE PROCESS_INPUT
         IS_READ_ONLY SMALLINT,
         PRIMARY KEY(PROCESS_ID,INPUT_NAME),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PROCESS_OUTPUT
 (
@@ -278,7 +278,7 @@ CREATE TABLE PROCESS_OUTPUT
         STORAGE_RESOURCE_ID varchar(255),
         PRIMARY KEY(PROCESS_ID,OUTPUT_NAME),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE PROCESS_STATUS (
@@ -289,7 +289,7 @@ CREATE TABLE PROCESS_STATUS (
         REASON LONGTEXT,
         PRIMARY KEY (STATUS_ID, PROCESS_ID),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE PROCESS_ERROR (
@@ -302,7 +302,7 @@ CREATE TABLE PROCESS_ERROR (
         ROOT_CAUSE_ERROR_ID_LIST text,
         PRIMARY KEY (ERROR_ID, PROCESS_ID),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
         PROCESS_ID varchar(255) NOT NULL,
@@ -315,7 +315,7 @@ CREATE TABLE PROCESS_RESOURCE_SCHEDULE (
         TOTAL_PHYSICAL_MEMORY int(11),
         PRIMARY KEY (PROCESS_ID),
         FOREIGN KEY (PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE TASK (
         TASK_ID varchar(255),
@@ -327,7 +327,7 @@ CREATE TABLE TASK (
         SUB_TASK_MODEL BLOB,
         PRIMARY KEY (TASK_ID),
         FOREIGN KEY (PARENT_PROCESS_ID) REFERENCES PROCESS(PROCESS_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE TASK_STATUS (
         STATUS_ID varchar(255),
@@ -337,7 +337,7 @@ CREATE TABLE TASK_STATUS (
         REASON LONGTEXT,
         PRIMARY KEY (STATUS_ID, TASK_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 
 CREATE TABLE TASK_ERROR (
@@ -350,7 +350,7 @@ CREATE TABLE TASK_ERROR (
         ROOT_CAUSE_ERROR_ID_LIST text,
         PRIMARY KEY (ERROR_ID, TASK_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE JOB (
         JOB_ID varchar(255),
@@ -366,7 +366,7 @@ CREATE TABLE JOB (
         EXIT_CODE INT(11),
         PRIMARY KEY (JOB_ID, TASK_ID),
         FOREIGN KEY (TASK_ID) REFERENCES TASK(TASK_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE JOB_STATUS (
         STATUS_ID varchar(255),
@@ -377,7 +377,7 @@ CREATE TABLE JOB_STATUS (
         REASON LONGTEXT,
         PRIMARY KEY (STATUS_ID, JOB_ID, TASK_ID),
         FOREIGN KEY (JOB_ID, TASK_ID) REFERENCES JOB(JOB_ID, TASK_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE QUEUE_STATUS(
         HOST_NAME VARCHAR(255),
@@ -387,7 +387,7 @@ CREATE TABLE QUEUE_STATUS(
         RUNNING_JOBS INT(11),
         QUEUED_JOBS INT(11),
         PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE CONFIGURATION
 (
@@ -396,6 +396,6 @@ CREATE TABLE CONFIGURATION
         EXPIRE_DATE TIMESTAMP DEFAULT NOW() ON UPDATE NOW(),
         CATEGORY_ID VARCHAR (255),
         PRIMARY KEY(CONFIG_KEY, CONFIG_VAL, CATEGORY_ID)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL, EXPIRE_DATE, CATEGORY_ID) VALUES('registry.version',
'0.16', NOW() ,'SYSTEM');
diff --git a/modules/registry-refactoring/src/main/resources/replicacatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/replicacatalog-mysql.sql
index 97e39b1..2cce9ac 100644
--- a/modules/registry-refactoring/src/main/resources/replicacatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/replicacatalog-mysql.sql
@@ -32,7 +32,7 @@ CREATE TABLE DATA_PRODUCT
         CREATION_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
         LAST_MODIFIED_TIME TIMESTAMP NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
         PRIMARY KEY (PRODUCT_URI)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE DATA_REPLICA_LOCATION
 (
@@ -47,7 +47,7 @@ CREATE TABLE DATA_REPLICA_LOCATION
         VALID_UNTIL_TIME TIMESTAMP NULL DEFAULT '0000-00-00 00:00:00',
         PRIMARY KEY (REPLICA_ID),
         FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE DATA_PRODUCT_METADATA
 (
@@ -56,7 +56,7 @@ CREATE TABLE DATA_PRODUCT_METADATA
         METADATA_VALUE VARCHAR(255),
         PRIMARY KEY(PRODUCT_URI, METADATA_KEY),
         FOREIGN KEY (PRODUCT_URI) REFERENCES DATA_PRODUCT(PRODUCT_URI) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE DATA_REPLICA_METADATA
 (
@@ -65,13 +65,13 @@ CREATE TABLE DATA_REPLICA_METADATA
         METADATA_VALUE VARCHAR(255),
         PRIMARY KEY(REPLICA_ID, METADATA_KEY),
         FOREIGN KEY (REPLICA_ID) REFERENCES DATA_REPLICA_LOCATION(REPLICA_ID) ON DELETE CASCADE
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 CREATE TABLE CONFIGURATION
 (
         CONFIG_KEY VARCHAR(255),
         CONFIG_VAL VARCHAR(255),
         PRIMARY KEY(CONFIG_KEY, CONFIG_VAL)
-);
+)ENGINE=InnoDB DEFAULT CHARSET=latin1;
 
 INSERT INTO CONFIGURATION (CONFIG_KEY, CONFIG_VAL) VALUES('data_catalog_version', '0.16');


Mime
View raw message