fixing the database creation failure
Project: http://git-wip-us.apache.org/repos/asf/airavata/repo Commit: http://git-wip-us.apache.org/repos/asf/airavata/commit/962d5c8c Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/962d5c8c Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/962d5c8c Branch: refs/heads/lahiru/AIRAVATA-2065 Commit: 962d5c8c4fb3f5cafa446fe644aa932f854f7bf2 Parents: 46b8502 Author: scnakandala <[email protected]> Authored: Fri Aug 26 02:06:02 2016 -0400 Committer: Lahiru Ginnaliya Gamathige <[email protected]> Committed: Mon Aug 29 00:53:10 2016 -0700 ---------------------------------------------------------------------- modules/registry/registry-core/pom.xml | 2 +- .../registry-core/src/main/resources/expcatalog-derby.sql | 3 ++- .../registry-core/src/main/resources/expcatalog-mysql.sql | 3 ++- 3 files changed, 5 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/airavata/blob/962d5c8c/modules/registry/registry-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml index 60da666..23db8c6 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -135,7 +135,7 @@ <inherited>true</inherited> <configuration> <failIfNoTests>false</failIfNoTests> - <skipTests>true</skipTests> + <skipTests>${skipTests}</skipTests> <workingDirectory>${project.build.testOutputDirectory}</workingDirectory> <!-- making sure that the sure-fire plugin doesn't run the integration tests--> <!-- Integration tests are run using the fail-safe plugin in the module pom--> http://git-wip-us.apache.org/repos/asf/airavata/blob/962d5c8c/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql ---------------------------------------------------------------------- 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 275c772..3388dea 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-derby.sql @@ -37,7 +37,8 @@ CREATE TABLE GATEWAY DECLINED_REASON varchar(255), OAUTH_CLIENT_SECRET varchar(255), OAUTH_CLIENT_ID varchar(255), - REQUEST_CREATION_TIME datetime DEFAULT CURRENT_TIMESTAMP, + REQUEST_CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + REQUESTER_USERNAME VARCHAR(255), PRIMARY KEY (GATEWAY_ID) ); http://git-wip-us.apache.org/repos/asf/airavata/blob/962d5c8c/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql ---------------------------------------------------------------------- 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 e5d6b09..2c776af 100644 --- a/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql +++ b/modules/registry/registry-core/src/main/resources/expcatalog-mysql.sql @@ -37,7 +37,8 @@ CREATE TABLE GATEWAY DECLINED_REASON varchar(255), OAUTH_CLIENT_SECRET varchar(255), OAUTH_CLIENT_ID varchar(255), - REQUEST_CREATION_TIME datetime DEFAULT CURRENT_TIMESTAMP, + REQUEST_CREATION_TIME TIMESTAMP DEFAULT CURRENT_TIMESTAMP, + REQUESTER_USERNAME VARCHAR(255), PRIMARY KEY (GATEWAY_ID) );
