Repository: airavata Updated Branches: refs/heads/master a9e022b9a -> 79750b7b5
http://git-wip-us.apache.org/repos/asf/airavata/blob/79750b7b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql ---------------------------------------------------------------------- diff --git a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql index a30b540..95c545a 100644 --- a/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql +++ b/modules/registry/airavata-jpa-registry/src/test/resources/registry-derby.sql @@ -56,20 +56,21 @@ CREATE TABLE PROJECT ( GATEWAY_NAME VARCHAR(255), USER_NAME VARCHAR(255) NOT NULL, - PROJECT_NAME VARCHAR(255), + PROJECT_ID VARCHAR(255), + PROJECT_NAME VARCHAR(255) NOT NULL, DESCRIPTION VARCHAR(255), CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, - PRIMARY KEY (PROJECT_NAME), + PRIMARY KEY (PROJECT_ID), FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE ); CREATE TABLE PROJECT_USER ( - PROJECT_NAME VARCHAR(255), + PROJECT_ID VARCHAR(255), USER_NAME VARCHAR(255), - PRIMARY KEY (PROJECT_NAME,USER_NAME), - FOREIGN KEY (PROJECT_NAME) REFERENCES PROJECT(PROJECT_NAME) ON DELETE CASCADE, + PRIMARY KEY (PROJECT_ID,USER_NAME), + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE, FOREIGN KEY (USER_NAME) REFERENCES USERS(USER_NAME) ON DELETE CASCADE ); @@ -140,7 +141,7 @@ CREATE TABLE EXPERIMENT EXPERIMENT_ID VARCHAR(255), GATEWAY_NAME VARCHAR(255), EXECUTION_USER VARCHAR(255) NOT NULL, - PROJECT_NAME VARCHAR(255) NOT NULL, + PROJECT_ID VARCHAR(255) NOT NULL, CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, EXPERIMENT_NAME VARCHAR(255) NOT NULL, EXPERIMENT_DESCRIPTION VARCHAR(255), @@ -151,7 +152,7 @@ CREATE TABLE EXPERIMENT WORKFLOW_EXECUTION_ID VARCHAR(255), PRIMARY KEY(EXPERIMENT_ID), FOREIGN KEY (GATEWAY_NAME) REFERENCES GATEWAY(GATEWAY_NAME) ON DELETE CASCADE, - FOREIGN KEY (PROJECT_NAME) REFERENCES PROJECT(PROJECT_NAME) ON DELETE CASCADE + FOREIGN KEY (PROJECT_ID) REFERENCES PROJECT(PROJECT_ID) ON DELETE CASCADE ); CREATE TABLE EXPERIMENT_INPUT http://git-wip-us.apache.org/repos/asf/airavata/blob/79750b7b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java ---------------------------------------------------------------------- diff --git a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java index 6aa38a9..eef18b8 100644 --- a/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java +++ b/modules/registry/registry-cpi/src/main/java/org/apache/airavata/registry/cpi/utils/Constants.java @@ -33,7 +33,7 @@ public class Constants { public static final String USER_NAME = "userName"; public static final String GATEWAY = "gateway"; public static final String EXPERIMENT_DESC = "experimentDescription"; - public static final String PROJECT_NAME = "project"; + public static final String PROJECT_ID = "projectId"; public static final String CREATION_TIME = "creationTime"; public static final String APPLICATION_ID = "applicationId"; public static final String APPLICATION_VERSION = "applicationVersion";
