[airavata] branch develop updated: Making sure migration scripts are rerunnable, conditional

[ma...@apache.org]

This is an automated email from the ASF dual-hosted git repository.

machristie pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata.git


The following commit(s) were added to refs/heads/develop by this push:
     new cccea8e  Making sure migration scripts are rerunnable, conditional
cccea8e is described below

commit cccea8e0d473ad8d03fd8503b6ee497c1e9133ba
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Thu Feb 21 10:23:11 2019 -0500

    Making sure migration scripts are rerunnable, conditional
    
    Also removed schema changes to tables that have been dropped.
---
 .../next/DeltaScripts/appCatalog_schema_delta.sql  | 26 +++++++++++-----------
 .../experimentCatalog_schema_delta.sql             |  2 +-
 2 files changed, 14 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 424b93b..b9bff30 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
@@ -64,13 +64,13 @@ alter table COMPUTE_RESOURCE_PREFERENCE modify column GATEWAY_ID VARCHAR(255) NO
 alter table COMPUTE_RESOURCE_PREFERENCE modify column RESOURCE_ID VARCHAR(255) NOT NULL;
 alter table SSH_ACCOUNT_PROVISIONER_CONFIG modify column GATEWAY_ID VARCHAR(255) NOT NULL;
 alter table SSH_ACCOUNT_PROVISIONER_CONFIG modify column RESOURCE_ID VARCHAR(255) NOT NULL;
-alter table DATA_STORAGE_PREFERENCE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
-alter table WORKFLOW_INPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
-alter table WORKFLOW_OUTPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
+-- alter table DATA_STORAGE_PREFERENCE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
+-- alter table WORKFLOW_INPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
+-- alter table WORKFLOW_OUTPUT modify column WF_TEMPLATE_ID VARCHAR(255) NOT NULL;
 set FOREIGN_KEY_CHECKS=1;
 
 -- AIRAVATA-2872: add missing column
-alter table APP_ENVIRONMENT add column ENV_ORDER INTEGER;
+alter table APP_ENVIRONMENT add column IF NOT EXISTS ENV_ORDER INTEGER;
 
 -- AIRAVATA-2939: add NOT NULL constraints to DB fields that aren't in data model
 alter table APPLICATION_MODULE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
@@ -91,7 +91,7 @@ ALTER TABLE `HOST_ALIAS` ENGINE = InnoDB;
 ALTER TABLE `JOB_SUBMISSION_INTERFACE` ENGINE = InnoDB;
 ALTER TABLE `LIBRARY_PREPAND_PATH` ENGINE = InnoDB;
 ALTER TABLE `LOCAL_SUBMISSION` ENGINE = InnoDB;
-ALTER TABLE `DATA_STORAGE_PREFERENCE` ENGINE = InnoDB;
+-- ALTER TABLE `DATA_STORAGE_PREFERENCE` ENGINE = InnoDB;
 ALTER TABLE `COMPUTE_RESOURCE` ENGINE = InnoDB;
 ALTER TABLE `COMPUTE_RESOURCE_FILE_SYSTEM` ENGINE = InnoDB;
 ALTER TABLE `LIBRARY_APEND_PATH` ENGINE = InnoDB;
@@ -116,10 +116,10 @@ ALTER TABLE `APPLICATION_MODULE` ENGINE = InnoDB;
 ALTER TABLE `UNICORE_DATAMOVEMENT` ENGINE = InnoDB;
 ALTER TABLE `APPLICATION_INTERFACE` ENGINE = InnoDB;
 ALTER TABLE `UNICORE_SUBMISSION` ENGINE = InnoDB;
-ALTER TABLE `WORKFLOW_INPUT` ENGINE = InnoDB;
-ALTER TABLE `WORKFLOW` ENGINE = InnoDB;
+-- ALTER TABLE `WORKFLOW_INPUT` ENGINE = InnoDB;
+-- ALTER TABLE `WORKFLOW` ENGINE = InnoDB;
 ALTER TABLE `SSH_JOB_SUBMISSION` ENGINE = InnoDB;
-ALTER TABLE `WORKFLOW_OUTPUT` ENGINE = InnoDB;
+-- ALTER TABLE `WORKFLOW_OUTPUT` ENGINE = InnoDB;
 ALTER TABLE `APPLICATION_DEPLOYMENT` ENGINE = InnoDB;
 ALTER TABLE `RESOURCE_JOB_MANAGER` ENGINE = InnoDB;
 ALTER TABLE `PREJOB_COMMAND` ENGINE = InnoDB;
@@ -193,7 +193,7 @@ ALTER TABLE `GATEWAY_PROFILE` DROP IF EXISTS `DATA_STORAGE_HOST`;
 -- This table was accidentally created by DB init script, but entity was mapped to STORAGE_PREFERENCE
 DROP TABLE IF EXISTS `DATA_STORAGE_PREFERENCE`;
 
-DROP TABLE IF EXISTS `WORKFLOW`, `WORKFLOW_INPUT`, `WORKFLOW_OUTPUT`;
+-- DROP TABLE IF EXISTS `WORKFLOW`, `WORKFLOW_INPUT`, `WORKFLOW_OUTPUT`;
 
 -- keys indexes
 ALTER TABLE `BATCH_QUEUE_RESOURCE_POLICY` ADD KEY IF NOT EXISTS `COMPUTE_RESOURCE_ID` (`COMPUTE_RESOURCE_ID`);
@@ -297,9 +297,9 @@ set FOREIGN_KEY_CHECKS=1;
 DROP TABLE IF EXISTS `DATA_STORAGE_INTERFACE`;
 DROP TABLE IF EXISTS `GATEWAY_CLIENT_CREDENTIAL`;
 
--- misnamed column. This migration will only be needed if the code that had created the old names had been deployed.
-UPDATE PARSER_CONNECTOR_INPUT set PARSER_OUTPUT_ID = PARENT_OUTPUT_ID;
-ALTER TABLE `PARSER_CONNECTOR_INPUT` DROP IF EXISTS `PARENT_OUTPUT_ID`;
-ALTER TABLE `PARSING_TEMPLATE_INPUT` DROP IF EXISTS `PARSER_INPUT_ID`;
+-- misnamed column. This migration was only needed in development environment where code with old column name was deployed.
+-- UPDATE PARSER_CONNECTOR_INPUT set PARSER_OUTPUT_ID = PARENT_OUTPUT_ID;
+-- ALTER TABLE `PARSER_CONNECTOR_INPUT` DROP IF EXISTS `PARENT_OUTPUT_ID`;
+-- ALTER TABLE `PARSING_TEMPLATE_INPUT` DROP IF EXISTS `PARSER_INPUT_ID`;
 
 ALTER TABLE `UNICORE_DATAMOVEMENT` DROP IF EXISTS `SECURITY_PROTOCOL`;
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 b6ce8e6..2c3624c 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
@@ -24,7 +24,7 @@ use experiment_catalog;
 alter table EXPERIMENT_INPUT modify METADATA VARCHAR(4096);
 
 -- AIRAVATA-2820
-alter table TASK drop column TASK_INTERNAL_STORE;
+alter table TASK drop column IF EXISTS TASK_INTERNAL_STORE;
 
 -- AIRAVATA-2827: OpenJPA 2.4.3 upgrade, convert BIT -> TINYINT(1)
 alter table PROCESS modify column USE_USER_CR_PREF tinyint(1);