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 2018/11/12 13:59:03 UTC
[airavata] branch develop updated: AIRAVATA-2939 Prevent setting
gateway_id to null
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 2dd7049 AIRAVATA-2939 Prevent setting gateway_id to null
2dd7049 is described below
commit 2dd7049e0a73478918b72bd9fe3a279bf46c25d8
Author: Marcus Christie <ma...@apache.org>
AuthorDate: Mon Nov 12 08:57:25 2018 -0500
AIRAVATA-2939 Prevent setting gateway_id to null
---
.../appcatalog/ApplicationDeploymentEntity.java | 8 ++++----
.../appcatalog/ApplicationInterfaceEntity.java | 8 ++++----
.../entities/appcatalog/ApplicationModuleEntity.java | 8 ++++----
.../src/main/resources/appcatalog-derby.sql | 18 +++++++++---------
.../src/main/resources/appcatalog-mysql.sql | 18 +++++++++---------
.../next/DeltaScripts/appCatalog_schema_delta.sql | 11 +++++++++++
6 files changed, 41 insertions(+), 30 deletions(-)
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
index 5e906f1..21e3af6 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationDeploymentEntity.java
@@ -42,7 +42,7 @@ public class ApplicationDeploymentEntity implements Serializable {
@Column(name = "APPLICATION_DESC")
private String appDeploymentDescription;
- @Column(name = "CREATION_TIME")
+ @Column(name = "CREATION_TIME", nullable = false, updatable = false)
private Timestamp creationTime;
@Column(name = "ENV_MODULE_LOAD_CMD")
@@ -51,14 +51,14 @@ public class ApplicationDeploymentEntity implements Serializable {
@Column(name = "EXECUTABLE_PATH")
private String executablePath;
- @Column(name = "GATEWAY_ID")
+ @Column(name = "GATEWAY_ID", nullable = false, updatable = false)
private String gatewayId;
@Column(name = "parallelism")
@Enumerated(EnumType.STRING)
private ApplicationParallelismType parallelism;
- @Column(name = "UPDATE_TIME")
+ @Column(name = "UPDATE_TIME", nullable = false)
private Timestamp updateTime;
@Column(name = "COMPUTE_HOSTID")
@@ -277,4 +277,4 @@ public class ApplicationDeploymentEntity implements Serializable {
this.postJobCommands = postJobCommands;
}
-}
\ No newline at end of file
+}
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
index cec6a0c..06ee356 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationInterfaceEntity.java
@@ -48,13 +48,13 @@ public class ApplicationInterfaceEntity implements Serializable {
@Column(name="ARCHIVE_WORKING_DIRECTORY")
private boolean archiveWorkingDirectory;
- @Column(name="CREATION_TIME")
+ @Column(name="CREATION_TIME", nullable = false, updatable = false)
private Timestamp creationTime;
- @Column(name="GATEWAY_ID")
+ @Column(name="GATEWAY_ID", nullable = false, updatable = false)
private String gatewayId;
- @Column(name="UPDATE_TIME")
+ @Column(name="UPDATE_TIME", nullable = false)
private Timestamp updateTime;
@Column(name="HAS_OPTIONAL_FILE_INPUTS")
@@ -161,4 +161,4 @@ public class ApplicationInterfaceEntity implements Serializable {
this.applicationOutputs = applicationOutputs;
}
-}
\ No newline at end of file
+}
diff --git a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
index 84d73be..f18dc63 100644
--- a/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
+++ b/modules/registry-refactoring/src/main/java/org/apache/airavata/registry/core/entities/appcatalog/ApplicationModuleEntity.java
@@ -40,10 +40,10 @@ public class ApplicationModuleEntity implements Serializable {
@Column(name = "MODULE_ID")
private String appModuleId;
- @Column(name = "CREATION_TIME")
+ @Column(name = "CREATION_TIME", nullable = false, updatable = false)
private Timestamp creationTime;
- @Column(name = "GATEWAY_ID")
+ @Column(name = "GATEWAY_ID", nullable = false, updatable = false)
private String gatewayId;
@Column(name = "MODULE_DESC")
@@ -55,7 +55,7 @@ public class ApplicationModuleEntity implements Serializable {
@Column(name = "MODULE_VERSION")
private String appModuleVersion;
- @Column(name = "UPDATE_TIME")
+ @Column(name = "UPDATE_TIME", nullable = false)
private Timestamp updateTime;
public ApplicationModuleEntity() {
@@ -116,4 +116,4 @@ public class ApplicationModuleEntity implements Serializable {
public void setUpdateTime(Timestamp updateTime) {
this.updateTime = updateTime;
}
-}
\ No newline at end of file
+}
diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql b/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql
index 7145d84..e8f2b3b 100644
--- a/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql
+++ b/modules/registry-refactoring/src/main/resources/appcatalog-derby.sql
@@ -207,9 +207,9 @@ CREATE TABLE APPLICATION_MODULE
MODULE_NAME VARCHAR(255),
MODULE_VERSION VARCHAR(255),
MODULE_DESC VARCHAR(500),
- GATEWAY_ID VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ GATEWAY_ID VARCHAR (255) NOT NULL,
+ CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
PRIMARY KEY(MODULE_ID)
);
@@ -222,9 +222,9 @@ CREATE TABLE APPLICATION_DEPLOYMENT
PARALLELISM VARCHAR(255),
APPLICATION_DESC VARCHAR(255),
ENV_MODULE_LOAD_CMD VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
- GATEWAY_ID VARCHAR(255),
+ CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
+ GATEWAY_ID VARCHAR(255) NOT NULL,
DEFAULT_QUEUE_NAME VARCHAR(255),
DEFAULT_NODE_COUNT INTEGER,
DEFAULT_CPU_COUNT INTEGER,
@@ -295,11 +295,11 @@ CREATE TABLE APPLICATION_INTERFACE
INTERFACE_ID VARCHAR(255),
APPLICATION_NAME VARCHAR(255),
APPLICATION_DESCRIPTION VARCHAR(500),
- GATEWAY_ID VARCHAR(255),
+ GATEWAY_ID VARCHAR(255) NOT NULL,
ARCHIVE_WORKING_DIRECTORY SMALLINT,
HAS_OPTIONAL_FILE_INPUTS SMALLINT,
- CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP,
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00',
+ CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
PRIMARY KEY(INTERFACE_ID)
);
diff --git a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
index 3db03da..9bcfbcc 100644
--- a/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
+++ b/modules/registry-refactoring/src/main/resources/appcatalog-mysql.sql
@@ -198,9 +198,9 @@ CREATE TABLE APPLICATION_MODULE
MODULE_NAME VARCHAR(255),
MODULE_VERSION VARCHAR(255),
MODULE_DESC VARCHAR(500),
- GATEWAY_ID VARCHAR (255),
- CREATION_TIME TIMESTAMP DEFAULT NOW(),
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
+ GATEWAY_ID VARCHAR (255) NOT NULL,
+ CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
PRIMARY KEY(MODULE_ID)
);
@@ -213,9 +213,9 @@ CREATE TABLE APPLICATION_DEPLOYMENT
PARALLELISM VARCHAR(255),
APPLICATION_DESC VARCHAR(255),
ENV_MODULE_LOAD_CMD VARCHAR(255),
- CREATION_TIME TIMESTAMP DEFAULT NOW(),
- UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' ,
- GATEWAY_ID VARCHAR(255),
+ CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
+ GATEWAY_ID VARCHAR(255) NOT NULL,
DEFAULT_QUEUE_NAME VARCHAR(255),
DEFAULT_NODE_COUNT INTEGER,
DEFAULT_CPU_COUNT INTEGER,
@@ -286,11 +286,11 @@ CREATE TABLE APPLICATION_INTERFACE
INTERFACE_ID VARCHAR(255),
APPLICATION_NAME VARCHAR(255),
APPLICATION_DESCRIPTION VARCHAR(500),
- GATEWAY_ID VARCHAR(255),
+ GATEWAY_ID VARCHAR(255) NOT NULL,
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',
+ CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL,
+ UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL,
PRIMARY KEY(INTERFACE_ID)
);
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 d711c65..2c156d4 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
@@ -69,3 +69,14 @@ set FOREIGN_KEY_CHECKS=1;
-- AIRAVATA-2872: add missing column
alter table APP_ENVIRONMENT add column 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;
+alter table APPLICATION_MODULE modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
+alter table APPLICATION_MODULE modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;
+alter table APPLICATION_DEPLOYMENT modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
+alter table APPLICATION_DEPLOYMENT modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;
+alter table APPLICATION_DEPLOYMENT modify column GATEWAY_ID VARCHAR(255) NOT NULL;
+alter table APPLICATION_INTERFACE modify column GATEWAY_ID VARCHAR(255) NOT NULL;
+alter table APPLICATION_INTERFACE modify column CREATION_TIME TIMESTAMP DEFAULT NOW() NOT NULL;
+alter table APPLICATION_INTERFACE modify column UPDATE_TIME TIMESTAMP DEFAULT '0000-00-00 00:00:00' NOT NULL;