You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@airavata.apache.org by ma...@apache.org on 2019/06/26 15:53:23 UTC
[airavata] branch staging updated: Fixing order of table creation
This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch staging
in repository https://gitbox.apache.org/repos/asf/airavata.git
The following commit(s) were added to refs/heads/staging by this push:
new 9366175 Fixing order of table creation
9366175 is described below
commit 9366175e93d758cbe4fc1864dba64ee1bcb75c7b
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 11:53:15 2019 -0400
Fixing order of table creation
---
.../next/DeltaScripts/appCatalog_schema_delta.sql | 146 ++++++++++-----------
1 file changed, 73 insertions(+), 73 deletions(-)
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
index 6a3ec04..2b15a5b 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/appCatalog_schema_delta.sql
@@ -21,6 +21,66 @@
use app_catalog;
-- new tables
+CREATE TABLE `PARSING_TEMPLATE` (
+ `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
+ `APP_INTERFACE_ID` varchar(255) NOT NULL,
+ `GATEWAY_ID` varchar(255) NOT NULL,
+ PRIMARY KEY (`PARSING_TEMPLATE_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `PARSER` (
+ `PARSER_ID` varchar(255) NOT NULL,
+ `IMAGE_NAME` varchar(255) NOT NULL,
+ `OUTPUT_DIR_PATH` varchar(255) NOT NULL,
+ `INPUT_DIR_PATH` varchar(255) NOT NULL,
+ `EXECUTION_COMMAND` varchar(255) NOT NULL,
+ `GATEWAY_ID` varchar(255) NOT NULL,
+ PRIMARY KEY (`PARSER_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GROUP_RESOURCE_PROFILE` (
+ `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+ `CREATION_TIME` bigint(20) NOT NULL,
+ `GATEWAY_ID` varchar(255) NOT NULL,
+ `GROUP_RESOURCE_PROFILE_NAME` varchar(255) DEFAULT NULL,
+ `UPDATE_TIME` bigint(20) NOT NULL,
+ `DEFAULT_CREDENTIAL_STORE_TOKEN` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`GROUP_RESOURCE_PROFILE_ID`),
+ UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
+ `RESOURCE_ID` varchar(255) NOT NULL,
+ `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
+ `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
+ `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
+ `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
+ `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
+ `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
+ `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
+ `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
+ `RESERVATION` varchar(255) DEFAULT NULL,
+ `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
+ `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
+ `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
+ `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
+ `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
+ `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
+ `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
+ KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
+ CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
+ CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+CREATE TABLE `GATEWAY_GROUPS` (
+ `GATEWAY_ID` varchar(255) NOT NULL,
+ `ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
+ `DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
+ `READ_ONLY_ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
+ PRIMARY KEY (`GATEWAY_ID`)
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
CREATE TABLE `BATCH_QUEUE_RESOURCE_POLICY` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
@@ -50,26 +110,6 @@ CREATE TABLE `PARSER_CONNECTOR` (
CONSTRAINT `PARSER_CONNECTOR_ibfk_3` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `PARSING_TEMPLATE_INPUT` (
- `PARSING_TEMPLATE_INPUT_ID` varchar(255) NOT NULL,
- `TARGET_PARSER_INPUT_ID` varchar(255) NOT NULL,
- `APPLICATION_OUTPUT_NAME` varchar(255) DEFAULT NULL,
- `VALUE` varchar(255) DEFAULT NULL,
- `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
- PRIMARY KEY (`PARSING_TEMPLATE_INPUT_ID`),
- KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
- KEY `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`),
- CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_1` FOREIGN KEY (`TARGET_PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
- CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_2` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE `PARSING_TEMPLATE` (
- `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
- `APP_INTERFACE_ID` varchar(255) NOT NULL,
- `GATEWAY_ID` varchar(255) NOT NULL,
- PRIMARY KEY (`PARSING_TEMPLATE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
CREATE TABLE `PARSER_OUTPUT` (
`PARSER_OUTPUT_ID` varchar(255) NOT NULL,
`PARSER_OUTPUT_NAME` varchar(255) NOT NULL,
@@ -92,6 +132,19 @@ CREATE TABLE `PARSER_INPUT` (
CONSTRAINT `PARSER_INPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+CREATE TABLE `PARSING_TEMPLATE_INPUT` (
+ `PARSING_TEMPLATE_INPUT_ID` varchar(255) NOT NULL,
+ `TARGET_PARSER_INPUT_ID` varchar(255) NOT NULL,
+ `APPLICATION_OUTPUT_NAME` varchar(255) DEFAULT NULL,
+ `VALUE` varchar(255) DEFAULT NULL,
+ `PARSING_TEMPLATE_ID` varchar(255) NOT NULL,
+ PRIMARY KEY (`PARSING_TEMPLATE_INPUT_ID`),
+ KEY `PARSING_TEMPLATE_ID` (`PARSING_TEMPLATE_ID`),
+ KEY `TARGET_PARSER_INPUT_ID` (`TARGET_PARSER_INPUT_ID`),
+ CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_1` FOREIGN KEY (`TARGET_PARSER_INPUT_ID`) REFERENCES `PARSER_INPUT` (`PARSER_INPUT_ID`) ON DELETE CASCADE,
+ CONSTRAINT `PARSING_TEMPLATE_INPUT_ibfk_2` FOREIGN KEY (`PARSING_TEMPLATE_ID`) REFERENCES `PARSING_TEMPLATE` (`PARSING_TEMPLATE_ID`) ON DELETE CASCADE
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
CREATE TABLE `COMPUTE_RESOURCE_POLICY` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
@@ -118,16 +171,6 @@ CREATE TABLE `PARSER_CONNECTOR_INPUT` (
CONSTRAINT `PARSER_CONNECTOR_INPUT_ibfk_3` FOREIGN KEY (`PARSER_CONNECTOR_ID`) REFERENCES `PARSER_CONNECTOR` (`PARSER_CONNECTOR_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `PARSER` (
- `PARSER_ID` varchar(255) NOT NULL,
- `IMAGE_NAME` varchar(255) NOT NULL,
- `OUTPUT_DIR_PATH` varchar(255) NOT NULL,
- `INPUT_DIR_PATH` varchar(255) NOT NULL,
- `EXECUTION_COMMAND` varchar(255) NOT NULL,
- `GATEWAY_ID` varchar(255) NOT NULL,
- PRIMARY KEY (`PARSER_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
CREATE TABLE `GRP_SSH_ACC_PROV_CONFIG` (
`CONFIG_NAME` varchar(255) NOT NULL,
`GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
@@ -138,49 +181,6 @@ CREATE TABLE `GRP_SSH_ACC_PROV_CONFIG` (
CONSTRAINT `GRP_SSH_ACC_PROV_CONFIG_ibfk_1` FOREIGN KEY (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_COMPUTE_RESOURCE_PREFERENCE` (`RESOURCE_ID`, `GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `GROUP_RESOURCE_PROFILE` (
- `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
- `CREATION_TIME` bigint(20) NOT NULL,
- `GATEWAY_ID` varchar(255) NOT NULL,
- `GROUP_RESOURCE_PROFILE_NAME` varchar(255) DEFAULT NULL,
- `UPDATE_TIME` bigint(20) NOT NULL,
- `DEFAULT_CREDENTIAL_STORE_TOKEN` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`GROUP_RESOURCE_PROFILE_ID`),
- UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
- `RESOURCE_ID` varchar(255) NOT NULL,
- `GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
- `ALLOCATION_PROJECT_NUMBER` varchar(255) DEFAULT NULL,
- `LOGIN_USERNAME` varchar(255) DEFAULT NULL,
- `OVERRIDE_BY_AIRAVATA` smallint(6) DEFAULT NULL,
- `PREFERED_BATCH_QUEUE` varchar(255) DEFAULT NULL,
- `PREFERED_DATA_MOVE_PROTOCOL` varchar(255) DEFAULT NULL,
- `PREFERED_JOB_SUB_PROTOCOL` varchar(255) DEFAULT NULL,
- `QUALITY_OF_SERVICE` varchar(255) DEFAULT NULL,
- `RESERVATION` varchar(255) DEFAULT NULL,
- `RESERVATION_END_TIME` timestamp NOT NULL DEFAULT '0000-00-00 00:00:00',
- `RESERVATION_START_TIME` timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP ON UPDATE CURRENT_TIMESTAMP,
- `RESOURCE_CS_TOKEN` varchar(255) DEFAULT NULL,
- `SCRATCH_LOCATION` varchar(255) DEFAULT NULL,
- `SSH_ACCOUNT_PROVISIONER` varchar(255) DEFAULT NULL,
- `SSH_ACCOUNT_PROVISIONER_ADDITIONAL_INFO` varchar(1000) DEFAULT NULL,
- `USAGE_REPORTING_GATEWAY_ID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`RESOURCE_ID`,`GROUP_RESOURCE_PROFILE_ID`),
- KEY `GROUP_RESOURCE_PROFILE_ID` (`GROUP_RESOURCE_PROFILE_ID`),
- CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_1` FOREIGN KEY (`RESOURCE_ID`) REFERENCES `COMPUTE_RESOURCE` (`RESOURCE_ID`) ON DELETE CASCADE,
- CONSTRAINT `GROUP_COMPUTE_RESOURCE_PREFERENCE_ibfk_2` FOREIGN KEY (`GROUP_RESOURCE_PROFILE_ID`) REFERENCES `GROUP_RESOURCE_PROFILE` (`GROUP_RESOURCE_PROFILE_ID`) ON DELETE CASCADE
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
-CREATE TABLE `GATEWAY_GROUPS` (
- `GATEWAY_ID` varchar(255) NOT NULL,
- `ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
- `DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
- `READ_ONLY_ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
- PRIMARY KEY (`GATEWAY_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-
CREATE TABLE `COMPUTE_RESOURCE_POLICY_QUEUES` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`QUEUE_NAME` varchar(255) NOT NULL,