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 2020/09/09 21:54:25 UTC
[airavata] 01/04: AIRAVATA-3369 Convert USER_FRIENDLY_DESC to CLOB
to allow longer descriptions
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
commit b4933b26560f7e7dc77f87d28d4452dac8a0ec8a
Author: Marcus Christie <ma...@iu.edu>
AuthorDate: Wed Sep 9 17:48:59 2020 -0400
AIRAVATA-3369 Convert USER_FRIENDLY_DESC to CLOB to allow longer descriptions
---
.../registry/core/entities/appcatalog/ApplicationInputEntity.java | 1 +
.../registry/core/entities/expcatalog/ExperimentInputEntity.java | 1 +
.../registry/core/entities/expcatalog/ProcessInputEntity.java | 1 +
.../registry/registry-core/src/main/resources/appcatalog-derby.sql | 2 +-
.../registry/registry-core/src/main/resources/appcatalog-mysql.sql | 2 +-
.../registry/registry-core/src/main/resources/expcatalog-derby.sql | 6 +++---
.../registry/registry-core/src/main/resources/expcatalog-mysql.sql | 4 ++--
.../0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql | 3 +++
.../0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql | 6 +++++-
9 files changed, 18 insertions(+), 8 deletions(-)
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
index 6061a9a..878ffb4 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInputEntity.java
@@ -73,6 +73,7 @@ public class ApplicationInputEntity implements Serializable {
@Column(name = "STANDARD_INPUT")
private boolean standardInput;
+ @Lob
@Column(name = "USER_FRIENDLY_DESC")
private String userFriendlyDescription;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
index b934a0d..db10e7d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ExperimentInputEntity.java
@@ -56,6 +56,7 @@ public class ExperimentInputEntity implements Serializable {
@Column(name = "STANDARD_INPUT")
private boolean standardInput;
+ @Lob
@Column(name = "USER_FRIENDLY_DESCRIPTION")
private String userFriendlyDescription;
diff --git a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
index ae31c6e..cbe4c1d 100644
--- a/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
+++ b/modules/registry/registry-core/src/main/java/org/apache/airavata/registry/core/entities/expcatalog/ProcessInputEntity.java
@@ -56,6 +56,7 @@ public class ProcessInputEntity implements Serializable {
@Column(name = "STANDARD_INPUT")
private boolean standardInput;
+ @Lob
@Column(name = "USER_FRIENDLY_DESCRIPTION")
private String userFriendlyDescription;
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
index ab1bcab..bc3be54 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-derby.sql
@@ -321,7 +321,7 @@ CREATE TABLE APPLICATION_INPUT
METADATA VARCHAR(4096),
APP_ARGUMENT VARCHAR(255),
STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
+ USER_FRIENDLY_DESC CLOB,
INPUT_ORDER INTEGER,
IS_REQUIRED SMALLINT,
REQUIRED_TO_COMMANDLINE SMALLINT,
diff --git a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
index 9ee940b..0d960e6 100644
--- a/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/appcatalog-mysql.sql
@@ -314,7 +314,7 @@ CREATE TABLE APPLICATION_INPUT
METADATA VARCHAR(4096),
APP_ARGUMENT VARCHAR(255),
STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESC VARCHAR(255),
+ USER_FRIENDLY_DESC TEXT,
INPUT_ORDER INTEGER,
IS_REQUIRED SMALLINT,
REQUIRED_TO_COMMANDLINE SMALLINT,
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
index 62b015d..f5517d0 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql
@@ -122,7 +122,7 @@ CREATE TABLE EXPERIMENT_INPUT
DATA_TYPE varchar(255),
APPLICATION_ARGUMENT varchar(255),
STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESCRIPTION varchar(255),
+ USER_FRIENDLY_DESCRIPTION CLOB,
METADATA varchar(4096),
INPUT_ORDER INT,
IS_REQUIRED SMALLINT,
@@ -250,7 +250,7 @@ CREATE TABLE PROCESS_INPUT
DATA_TYPE varchar(255),
APPLICATION_ARGUMENT varchar(255),
STANDARD_INPUT SMALLINT,
- USER_FRIENDLY_DESCRIPTION varchar(255),
+ USER_FRIENDLY_DESCRIPTION CLOB,
METADATA varchar(4096),
INPUT_ORDER INT,
IS_REQUIRED SMALLINT,
@@ -423,4 +423,4 @@ CREATE TABLE GATEWAY_USAGE_REPORTING_COMMAND (
COMPUTE_RESOURCE_ID VARCHAR(255) NOT NULL,
COMMAND LONG VARCHAR NOT NULL,
PRIMARY KEY (GATEWAY_ID, COMPUTE_RESOURCE_ID)
-)
\ No newline at end of file
+)
diff --git a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
index 3560703..b885c92 100644
--- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
+++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql
@@ -122,7 +122,7 @@ CREATE TABLE EXPERIMENT_INPUT
DATA_TYPE varchar(255),
APPLICATION_ARGUMENT varchar(255),
STANDARD_INPUT tinyint(1),
- USER_FRIENDLY_DESCRIPTION varchar(255),
+ USER_FRIENDLY_DESCRIPTION TEXT,
METADATA varchar(4096),
INPUT_ORDER int(11),
IS_REQUIRED tinyint(1),
@@ -252,7 +252,7 @@ CREATE TABLE PROCESS_INPUT
DATA_TYPE varchar(255),
APPLICATION_ARGUMENT varchar(255),
STANDARD_INPUT tinyint(1),
- USER_FRIENDLY_DESCRIPTION varchar(255),
+ USER_FRIENDLY_DESCRIPTION TEXT,
METADATA varchar(4096),
INPUT_ORDER int(11),
IS_REQUIRED tinyint(1),
diff --git a/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql
index 8092f44..f95ed58 100644
--- a/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/appCatalog_schema_delta.sql
@@ -24,3 +24,6 @@ use app_catalog;
alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION;
alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_START_TIME;
alter table GROUP_COMPUTE_RESOURCE_PREFERENCE drop column IF EXISTS RESERVATION_END_TIME;
+
+-- AIRAVATA-3369: Convert USER_FRIENDLY_DESC from VARCHAR to TEXT (CLOB)
+alter table APPLICATION_INPUT modify column USER_FRIENDLY_DESC TEXT;
diff --git a/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql b/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
index f99e973..17004e2 100644
--- a/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
+++ b/modules/registry/release-migration-scripts/0.19-0.20/DeltaScripts/experimentCatalog_schema_delta.sql
@@ -25,4 +25,8 @@ CREATE TABLE IF NOT exists `GATEWAY_USAGE_REPORTING_COMMAND` (
`COMPUTE_RESOURCE_ID` varchar(255) NOT NULL,
`COMMAND` longtext NOT NULL,
PRIMARY KEY (`GATEWAY_ID`, `COMPUTE_RESOURCE_ID`)
-) ENGINE=InnoDB DEFAULT CHARSET=latin1;
\ No newline at end of file
+) ENGINE=InnoDB DEFAULT CHARSET=latin1;
+
+-- AIRAVATA-3369: Convert USER_FRIENDLY_DESC from VARCHAR to TEXT (CLOB)
+alter table EXPERIMENT_INPUT modify column USER_FRIENDLY_DESC TEXT;
+alter table PROCESS_INPUT modify column USER_FRIENDLY_DESC TEXT;