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/bfff64c5 Tree: http://git-wip-us.apache.org/repos/asf/airavata/tree/bfff64c5 Diff: http://git-wip-us.apache.org/repos/asf/airavata/diff/bfff64c5 Branch: refs/heads/lahiru/AIRAVATA-2065 Commit: bfff64c58c58b62116f64d7c81b6fbc4d23d7d52 Parents: 415e9b7 Author: scnakandala <supun.nakand...@gmail.com> Authored: Fri Aug 26 02:06:02 2016 -0400 Committer: scnakandala <supun.nakand...@gmail.com> Committed: Fri Aug 26 02:06:02 2016 -0400 ---------------------------------------------------------------------- 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/bfff64c5/modules/registry/registry-core/pom.xml ---------------------------------------------------------------------- diff --git a/modules/registry/registry-core/pom.xml b/modules/registry/registry-core/pom.xml index 85986ae..aa9a61b 100644 --- a/modules/registry/registry-core/pom.xml +++ b/modules/registry/registry-core/pom.xml @@ -162,7 +162,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/bfff64c5/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/bfff64c5/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) );
