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 18:51:34 UTC
[airavata] branch staging updated: Adding missing column
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 b8fbfb7 Adding missing column
b8fbfb7 is described below
commit b8fbfb79d317ce4e0cbe65dd1bf8857539a3993a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Jun 26 14:51:26 2019 -0400
Adding missing column
Also making sure app_catalog migration script is re-runnable
---
.../next/DeltaScripts/appCatalog_schema_delta.sql | 28 +++++++++++-----------
.../experimentCatalog_schema_delta.sql | 2 ++
2 files changed, 16 insertions(+), 14 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 2b15a5b..5aa80a7 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,14 +21,14 @@
use app_catalog;
-- new tables
-CREATE TABLE `PARSING_TEMPLATE` (
+CREATE TABLE IF NOT EXISTS `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` (
+CREATE TABLE IF NOT exists `PARSER` (
`PARSER_ID` varchar(255) NOT NULL,
`IMAGE_NAME` varchar(255) NOT NULL,
`OUTPUT_DIR_PATH` varchar(255) NOT NULL,
@@ -38,7 +38,7 @@ CREATE TABLE `PARSER` (
PRIMARY KEY (`PARSER_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `GROUP_RESOURCE_PROFILE` (
+CREATE TABLE IF NOT EXISTS `GROUP_RESOURCE_PROFILE` (
`GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
`CREATION_TIME` bigint(20) NOT NULL,
`GATEWAY_ID` varchar(255) NOT NULL,
@@ -49,7 +49,7 @@ CREATE TABLE `GROUP_RESOURCE_PROFILE` (
UNIQUE KEY `GATEWAY_ID` (`GATEWAY_ID`,`GROUP_RESOURCE_PROFILE_NAME`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
+CREATE TABLE IF NOT EXISTS `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,
@@ -73,7 +73,7 @@ CREATE TABLE `GROUP_COMPUTE_RESOURCE_PREFERENCE` (
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` (
+CREATE TABLE IF NOT EXISTS `GATEWAY_GROUPS` (
`GATEWAY_ID` varchar(255) NOT NULL,
`ADMINS_GROUP_ID` varchar(255) DEFAULT NULL,
`DEFAULT_GATEWAY_USERS_GROUP_ID` varchar(255) DEFAULT NULL,
@@ -81,7 +81,7 @@ CREATE TABLE `GATEWAY_GROUPS` (
PRIMARY KEY (`GATEWAY_ID`)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `BATCH_QUEUE_RESOURCE_POLICY` (
+CREATE TABLE IF NOT EXISTS `BATCH_QUEUE_RESOURCE_POLICY` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
`GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
@@ -96,7 +96,7 @@ CREATE TABLE `BATCH_QUEUE_RESOURCE_POLICY` (
CONSTRAINT `BATCH_QUEUE_RESOURCE_POLICY_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 `PARSER_CONNECTOR` (
+CREATE TABLE IF NOT EXISTS `PARSER_CONNECTOR` (
`PARSER_CONNECTOR_ID` varchar(255) NOT NULL,
`PARENT_PARSER_ID` varchar(255) NOT NULL,
`CHILD_PARSER_ID` varchar(255) NOT NULL,
@@ -110,7 +110,7 @@ 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 `PARSER_OUTPUT` (
+CREATE TABLE IF NOT EXISTS `PARSER_OUTPUT` (
`PARSER_OUTPUT_ID` varchar(255) NOT NULL,
`PARSER_OUTPUT_NAME` varchar(255) NOT NULL,
`PARSER_OUTPUT_REQUIRED` tinyint(1) NOT NULL,
@@ -121,7 +121,7 @@ CREATE TABLE `PARSER_OUTPUT` (
CONSTRAINT `PARSER_OUTPUT_ibfk_1` FOREIGN KEY (`PARSER_ID`) REFERENCES `PARSER` (`PARSER_ID`) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
-CREATE TABLE `PARSER_INPUT` (
+CREATE TABLE IF NOT EXISTS `PARSER_INPUT` (
`PARSER_INPUT_ID` varchar(255) NOT NULL,
`PARSER_INPUT_NAME` varchar(255) NOT NULL,
`PARSER_INPUT_REQUIRED` tinyint(1) NOT NULL,
@@ -132,7 +132,7 @@ 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` (
+CREATE TABLE IF NOT EXISTS `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,
@@ -145,7 +145,7 @@ CREATE TABLE `PARSING_TEMPLATE_INPUT` (
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` (
+CREATE TABLE IF NOT EXISTS `COMPUTE_RESOURCE_POLICY` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
`GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
@@ -156,7 +156,7 @@ CREATE TABLE `COMPUTE_RESOURCE_POLICY` (
CONSTRAINT `COMPUTE_RESOURCE_POLICY_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 `PARSER_CONNECTOR_INPUT` (
+CREATE TABLE IF NOT EXISTS `PARSER_CONNECTOR_INPUT` (
`PARSER_CONNECTOR_INPUT_ID` varchar(255) NOT NULL,
`PARSER_INPUT_ID` varchar(255) NOT NULL,
`PARSER_OUTPUT_ID` varchar(255) DEFAULT NULL,
@@ -171,7 +171,7 @@ 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 `GRP_SSH_ACC_PROV_CONFIG` (
+CREATE TABLE IF NOT EXISTS `GRP_SSH_ACC_PROV_CONFIG` (
`CONFIG_NAME` varchar(255) NOT NULL,
`GROUP_RESOURCE_PROFILE_ID` varchar(255) NOT NULL,
`RESOURCE_ID` varchar(255) NOT NULL,
@@ -181,7 +181,7 @@ 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 `COMPUTE_RESOURCE_POLICY_QUEUES` (
+CREATE TABLE IF NOT EXISTS `COMPUTE_RESOURCE_POLICY_QUEUES` (
`RESOURCE_POLICY_ID` varchar(255) NOT NULL,
`QUEUE_NAME` varchar(255) NOT NULL,
PRIMARY KEY (`RESOURCE_POLICY_ID`,`QUEUE_NAME`),
diff --git a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
index bd4b274..61ceacc 100644
--- a/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/next/DeltaScripts/experimentCatalog_schema_delta.sql
@@ -101,3 +101,5 @@ ALTER TABLE PROCESS_RESOURCE_SCHEDULE ADD COLUMN IF NOT EXISTS OVERRIDE_SCRATCH_
-- AIRAVATA-3029: Add METADATA to EXPERIMENT_OUTPUT and PROCESS_OUTPUT
ALTER TABLE `EXPERIMENT_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
ALTER TABLE `PROCESS_OUTPUT` ADD COLUMN IF NOT EXISTS METADATA VARCHAR(4096);
+
+ALTER TABLE `PROCESS` ADD `GROUP_RESOURCE_PROFILE_ID` varchar(255) DEFAULT NULL;