This is an automated email from the ASF dual-hosted git repository. machristie pushed a commit to branch group-based-auth in repository https://gitbox.apache.org/repos/asf/airavata.git
commit 5b2aa800a1e9e47a713dc07e89eff7130291a118 Author: Marcus Christie <[email protected]> AuthorDate: Fri Jun 15 09:31:48 2018 -0400 AIRAVATA-2827 OpenJPA 2.4.3 upgrade: convert BIT to TINYINT(1) --- .../src/main/resources/appcatalog-mysql.sql | 3 ++- .../src/main/resources/expcatalog-mysql.sql | 4 ++-- .../next/DeltaScripts/appCatalog_schema_delta.sql | 11 ++++++++++- .../next/DeltaScripts/experimentCatalog_schema_delta.sql | 7 ++++++- 4 files changed, 20 insertions(+), 5 deletions(-) diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql index 9663dee..39a0069 100644 --- a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql +++ b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql @@ -31,7 +31,7 @@ CREATE TABLE COMPUTE_RESOURCE DEFAULT_CPU_COUNT INTEGER, DEFAULT_WALLTIME INTEGER, ENABLED SMALLINT, - GATEWAY_USAGE_REPORTING SMALLINT, + GATEWAY_USAGE_REPORTING TINYINT(1), GATEWAY_USAGE_MODULE_LOAD_CMD VARCHAR(500), GATEWAY_USAGE_EXECUTABLE VARCHAR(255), PRIMARY KEY (RESOURCE_ID) @@ -277,6 +277,7 @@ CREATE TABLE APPLICATION_INTERFACE APPLICATION_DESCRIPTION VARCHAR(500), GATEWAY_ID VARCHAR(255), ARCHIVE_WORKING_DIRECTORY SMALLINT, + HAS_OPTIONAL_FILE_INPUTS TINYINT(1), CREATION_TIME TIMESTAMP DEFAULT NOW(), UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00', PRIMARY KEY(INTERFACE_ID) diff --git a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql index 29952e5..1dbfe33 100644 --- a/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry-refactoring/src/main/resources/expcatalog-mysql.sql @@ -237,7 +237,7 @@ CREATE TABLE PROCESS ( EXPERIMENT_DATA_DIR VARCHAR (512), USERNAME VARCHAR (255), GROUP_RESOURCE_PROFILE_ID VARCHAR (255) DEFAULT NULL, - USE_USER_CR_PREF BIT(1), + USE_USER_CR_PREF TINYINT(1), PRIMARY KEY (PROCESS_ID), FOREIGN KEY (EXPERIMENT_ID) REFERENCES EXPERIMENT(EXPERIMENT_ID) ON DELETE CASCADE ); @@ -383,7 +383,7 @@ CREATE TABLE QUEUE_STATUS( HOST_NAME VARCHAR(255), QUEUE_NAME VARCHAR(255), CREATED_TIME BIGINT(20), - QUEUE_UP BIT(1), + QUEUE_UP TINYINT(1), RUNNING_JOBS INT(11), QUEUED_JOBS INT(11), PRIMARY KEY (HOST_NAME, QUEUE_NAME, CREATED_TIME) 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 def5dcf..272ed9b 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 @@ -28,4 +28,13 @@ alter table COMPUTE_RESOURCE modify column CPUS_PER_NODE int default 0 null; alter table COMPUTE_RESOURCE modify column DEFAULT_NODE_COUNT int default 0 null; alter table COMPUTE_RESOURCE modify column DEFAULT_CPU_COUNT int default 0 null; alter table COMPUTE_RESOURCE modify column DEFAULT_WALLTIME int default 0 null; -alter table COMPUTE_RESOURCE modify column UPDATE_TIME timestamp default '0000-00-00 00:00:00' null; \ No newline at end of file +alter table COMPUTE_RESOURCE modify column UPDATE_TIME timestamp default '0000-00-00 00:00:00' null; + +-- AIRAVATA-2827: OpenJPA 2.4.3 upgrade, convert BIT -> TINYINT(1) +alter table APPLICATION_OUTPUT modify column OUTPUT_STREAMING tinyint(1); +alter table APPLICATION_INTERFACE modify column ARCHIVE_WORKING_DIRECTORY tinyint(1); +alter table APPLICATION_INTERFACE modify column HAS_OPTIONAL_FILE_INPUTS tinyint(1); +alter table APPLICATION_DEPLOYMENT modify column EDITABLE_BY_USER tinyint(1); +alter table BATCH_QUEUE modify column IS_DEFAULT_QUEUE tinyint(1); +alter table COMPUTE_RESOURCE modify column GATEWAY_USAGE_REPORTING tinyint(1); +alter table USER_COMPUTE_RESOURCE_PREFERENCE modify column VALIDATED tinyint(1) default 0; \ No newline at end of file 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 f70fdd2..9b19987 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 @@ -22,4 +22,9 @@ alter table EXPERIMENT_INPUT modify METADATA VARCHAR(4096); -- AIRAVATA-2820 -alter table TASK drop column TASK_INTERNAL_STORE; \ No newline at end of file +alter table TASK drop column 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); +alter table QUEUE_STATUS modify column QUEUE_UP tinyint(1); +alter table USER_CONFIGURATION_DATA modify column IS_USE_USER_CR_PREF tinyint(1); -- To stop receiving notification emails like this one, please contact [email protected].
