This is an automated email from the ASF dual-hosted git repository.
smarru pushed a commit to branch develop
in repository https://gitbox.apache.org/repos/asf/airavata-custos.git
commit 1f86fea200266ac9fc3592109fc84f3928a3c3c8
Author: Aarushi <aarushiibi...@gmail.com>
AuthorDate: Tue Jun 25 08:51:38 2019 -0400
corrected the sql files
---
.../user-profile-catalog-derby.sql | 62 +++++++++++-----------
.../user-profile-catalog-mysql.sql | 62 +++++++++++-----------
pom.xml | 6 +++
3 files changed, 68 insertions(+), 62 deletions(-)
diff --git
a/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-derby.sql
b/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-derby.sql
index 9ac9155..7600772 100644
---
a/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-derby.sql
+++
b/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-derby.sql
@@ -20,7 +20,7 @@
*/
CREATE TABLE IF NOT EXISTS GATEWAY (
- AIRAVATA_INTERNAL_GATEWAY_ID varchar(255) NOT NULL,
+ CUSTOS_INTERNAL_GATEWAY_ID varchar(255) NOT NULL,
DECLINED_REASON varchar(255) DEFAULT NULL,
GATEWAY_DOMAIN varchar(255) DEFAULT NULL,
EMAIL_ADDRESS varchar(255) DEFAULT NULL,
@@ -40,11 +40,11 @@ CREATE TABLE IF NOT EXISTS GATEWAY (
REQUEST_CREATION_TIME bigint(20) DEFAULT NULL,
REQUESTER_USERNAME varchar(255) DEFAULT NULL,
GATEWAY_REVIEW_PROPOSAL_DESCRIPTION varchar(255) DEFAULT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_GATEWAY_ID)
+ PRIMARY KEY (CUSTOS_INTERNAL_GATEWAY_ID)
);
CREATE TABLE USER_PROFILE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
USER_ID VARCHAR (255) NOT NULL,
GATEWAY_ID VARCHAR (255) NOT NULL,
USER_MODEL_VERSION VARCHAR (255),
@@ -64,67 +64,67 @@ CREATE TABLE USER_PROFILE (
COMMENTS CLOB,
GPG_KEY CLOB,
TIME_ZONE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID)
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID)
);
CREATE TABLE USER_PROFILE_EMAIL (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
EMAIL VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, EMAIL),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, EMAIL),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE USER_PROFILE_PHONE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
PHONE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, PHONE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, PHONE ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE USER_PROFILE_NATIONALITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
NATIONALITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, NATIONALITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, NATIONALITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE USER_PROFILE_LABELED_URI (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
LABELED_URI VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, LABELED_URI ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, LABELED_URI ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE NSF_DEMOGRAPHIC (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
GENDER VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE NSF_DEMOGRAPHIC_ETHNICITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
ETHNICITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, ETHNICITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, ETHNICITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE NSF_DEMOGRAPHIC_RACE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
RACE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, RACE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, RACE ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE NSF_DEMOGRAPHIC_DISABILITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
DISABILITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, DISABILITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, DISABILITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE CUSTOMIZED_DASHBOARD (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
ENABLED_EXPERIMENT_ID VARCHAR (255),
ENABLED_NAME VARCHAR (255),
ENABLED_DESCRIPTION VARCHAR (255),
@@ -149,8 +149,8 @@ CREATE TABLE CUSTOMIZED_DASHBOARD (
ENABLED_OUTPUTS VARCHAR (255),
ENABLED_STORAGE_DIR VARCHAR (255),
ENABLED_ERRORS VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
);
CREATE TABLE CONFIGURATION
diff --git
a/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
b/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
index bcc37af..6da1c93 100644
---
a/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
+++
b/custos-profile-service/profile-user-core/src/main/resources/database_scripts/user-profile-catalog-mysql.sql
@@ -20,7 +20,7 @@
*/
CREATE TABLE IF NOT EXISTS GATEWAY (
- AIRAVATA_INTERNAL_GATEWAY_ID varchar(255) NOT NULL,
+ CUSTOS_INTERNAL_GATEWAY_ID varchar(255) NOT NULL,
DECLINED_REASON varchar(255) DEFAULT NULL,
GATEWAY_DOMAIN varchar(255) DEFAULT NULL,
EMAIL_ADDRESS varchar(255) DEFAULT NULL,
@@ -40,11 +40,11 @@ CREATE TABLE IF NOT EXISTS GATEWAY (
REQUEST_CREATION_TIME bigint(20) DEFAULT NULL,
REQUESTER_USERNAME varchar(255) DEFAULT NULL,
GATEWAY_REVIEW_PROPOSAL_DESCRIPTION varchar(255) DEFAULT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_GATEWAY_ID)
+ PRIMARY KEY (CUSTOS_INTERNAL_GATEWAY_ID)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS USER_PROFILE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
USER_ID VARCHAR (255) NOT NULL,
GATEWAY_ID VARCHAR (255) NOT NULL,
USER_MODEL_VERSION VARCHAR (255),
@@ -64,67 +64,67 @@ CREATE TABLE IF NOT EXISTS USER_PROFILE (
COMMENTS TEXT,
GPG_KEY TEXT,
TIME_ZONE VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID)
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID)
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS USER_PROFILE_EMAIL (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
EMAIL VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, EMAIL),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, EMAIL),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS USER_PROFILE_PHONE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
PHONE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, PHONE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, PHONE ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS USER_PROFILE_NATIONALITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
NATIONALITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, NATIONALITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, NATIONALITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS USER_PROFILE_LABELED_URI (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
LABELED_URI VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, LABELED_URI ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, LABELED_URI ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
GENDER VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_ETHNICITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
ETHNICITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, ETHNICITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, ETHNICITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_RACE (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
RACE VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, RACE ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, RACE ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS NSF_DEMOGRAPHIC_DISABILITY (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
DISABILITY VARCHAR (255) NOT NULL,
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID, DISABILITY ),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID, DISABILITY ),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
NSF_DEMOGRAPHIC(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE IF NOT EXISTS CUSTOMIZED_DASHBOARD (
- AIRAVATA_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
+ CUSTOS_INTERNAL_USER_ID VARCHAR (255) NOT NULL,
ENABLED_EXPERIMENT_ID VARCHAR (255),
ENABLED_NAME VARCHAR (255),
ENABLED_DESCRIPTION VARCHAR (255),
@@ -149,8 +149,8 @@ CREATE TABLE IF NOT EXISTS CUSTOMIZED_DASHBOARD (
ENABLED_OUTPUTS VARCHAR (255),
ENABLED_STORAGE_DIR VARCHAR (255),
ENABLED_ERRORS VARCHAR (255),
- PRIMARY KEY (AIRAVATA_INTERNAL_USER_ID),
- FOREIGN KEY (AIRAVATA_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(AIRAVATA_INTERNAL_USER_ID) ON DELETE CASCADE
+ PRIMARY KEY (CUSTOS_INTERNAL_USER_ID),
+ FOREIGN KEY (CUSTOS_INTERNAL_USER_ID) REFERENCES
USER_PROFILE(CUSTOS_INTERNAL_USER_ID) ON DELETE CASCADE
) ENGINE=InnoDB DEFAULT CHARSET=latin1;
CREATE TABLE CONFIGURATION
diff --git a/pom.xml b/pom.xml
index aa895c8..d42d29e 100644
--- a/pom.xml
+++ b/pom.xml
@@ -20,6 +20,7 @@
<module>custos-connectors</module>
<module>custos-profile-service</module>
<module>custos-client</module>
+ <module>ide-integration</module>
</modules>
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
@@ -45,5 +46,10 @@
<artifactId>libthrift</artifactId>
<version>${thrift.version}</version>
</dependency>
+ <dependency>
+ <groupId>org.mariadb.jdbc</groupId>
+ <artifactId>mariadb-java-client</artifactId>
+ <version>2.0.2</version>
+ </dependency>
</dependencies>
</project>
\ No newline at end of file
