This is an automated email from the ASF dual-hosted git repository.
machristie pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/airavata.git
commit e78ff86e7ff3a180ba9edf725352b013d24f77e3
Merge: 6e51d46 5209ef3
Author: Marcus Christie <machr...@iu.edu>
AuthorDate: Wed Apr 22 20:27:17 2020 -0400
Merge branch 'airavata-3268'
.../lib/airavata/model/application/io/ttypes.py | 16 ++-
.../resources/lib/airavata/model/group/ttypes.py | 3 +
.../resources/lib/airavata/model/sharing/ttypes.py | 15 ++-
.../model/application/io/InputDataObjectType.java | 115 ++++++++++++++++++++-
.../task/submission/config/GroovyMapBuilder.java | 12 ++-
.../init/03-appcatalog-migrations.sql | 3 +
.../init/04-expcatalog-migrations.sql | 4 +
.../cpi/impl/SimpleOrchestratorImpl.java | 5 +-
.../appcatalog/ApplicationInputEntity.java | 11 ++
.../entities/expcatalog/ExperimentInputEntity.java | 13 ++-
.../entities/expcatalog/ProcessInputEntity.java | 13 ++-
.../src/main/resources/appcatalog-derby.sql | 1 +
.../src/main/resources/appcatalog-mysql.sql | 1 +
.../src/main/resources/expcatalog-derby.sql | 2 +
.../src/main/resources/expcatalog-mysql.sql | 2 +
.../expcatalog/ExperimentRepositoryTest.java | 4 +
.../DeltaScripts/appCatalog_schema_delta.sql | 4 +
.../experimentCatalog_schema_delta.sql | 4 +
.../application_io_models.thrift | 5 +-
19 files changed, 219 insertions(+), 14 deletions(-)
diff --cc
modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
index 7f1c2c8,7a97d50..487a324
---
a/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
+++
b/modules/registry/release-migration-scripts/0.18-0.19/DeltaScripts/experimentCatalog_schema_delta.sql
@@@ -115,15 -115,6 +115,19 @@@ wher
g.OAUTH_CLIENT_ID is null
or g.OAUTH_CLIENT_SECRET is null;
+-- AIRAVATA-3303 Slashes in experiment id
+set FOREIGN_KEY_CHECKS=0;
+
+update EXPERIMENT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where
EXPERIMENT_ID like '%/%';
+update EXPERIMENT_INPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_")
where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_OUTPUT set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_")
where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_STATUS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_")
where EXPERIMENT_ID like '%/%';
+update EXPERIMENT_ERROR set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_")
where EXPERIMENT_ID like '%/%';
+update USER_CONFIGURATION_DATA set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID,
"/", "_") where EXPERIMENT_ID like '%/%';
+update PROCESS set EXPERIMENT_ID = REPLACE(EXPERIMENT_ID, "/", "_") where
EXPERIMENT_ID like '%/%';
+
+set FOREIGN_KEY_CHECKS=1;
++
+ -- AIRAVATA-3268: add overrideFilename to EXPERIMENT_INPUT, PROCESS_INPUT
+ ALTER TABLE EXPERIMENT_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME
VARCHAR(255);
+ ALTER TABLE PROCESS_INPUT ADD COLUMN IF NOT EXISTS OVERRIDE_FILENAME
VARCHAR(255);
