You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2015/05/05 14:34:13 UTC
tomee git commit: we can also guess the driver for
HerokuDatabasePropertiesProvider
Repository: tomee
Updated Branches:
refs/heads/master 98029f737 -> 4aa900ca5
we can also guess the driver for HerokuDatabasePropertiesProvider
Project: http://git-wip-us.apache.org/repos/asf/tomee/repo
Commit: http://git-wip-us.apache.org/repos/asf/tomee/commit/4aa900ca
Tree: http://git-wip-us.apache.org/repos/asf/tomee/tree/4aa900ca
Diff: http://git-wip-us.apache.org/repos/asf/tomee/diff/4aa900ca
Branch: refs/heads/master
Commit: 4aa900ca56ea16574c3b6fbb9fde0cecd735da5d
Parents: 98029f7
Author: Romain Manni-Bucau <rm...@apache.org>
Authored: Tue May 5 14:34:05 2015 +0200
Committer: Romain Manni-Bucau <rm...@apache.org>
Committed: Tue May 5 14:34:05 2015 +0200
----------------------------------------------------------------------
.../resource/heroku/HerokuDatabasePropertiesProvider.java | 7 +++++++
.../resource/heroku/HerokuDatabasePropertiesProviderTest.java | 7 ++++++-
2 files changed, 13 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/tomee/blob/4aa900ca/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java b/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
index 4c95a4a..aa9482d 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProvider.java
@@ -33,6 +33,8 @@ public class HerokuDatabasePropertiesProvider implements PropertiesResourceProvi
put("hsql", "hsqldb:hsql");
}};
+ private Properties properties;
+
@Override
public Properties provides() {
try {
@@ -53,6 +55,11 @@ public class HerokuDatabasePropertiesProvider implements PropertiesResourceProvi
builder.p("UserName", userInfo);
}
}
+ if (properties == null || "org.hsqldb.jdbcDriver".equals(properties.getProperty("JdbcDriver"))) {
+ if ("postgres".equalsIgnoreCase(url.getScheme())) {
+ builder.p("JdbcDriver", "org.postgresql.Driver");
+ } // else TODO
+ }
return builder.build();
} catch (final URISyntaxException e) {
throw new IllegalArgumentException(e);
http://git-wip-us.apache.org/repos/asf/tomee/blob/4aa900ca/container/openejb-core/src/test/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProviderTest.java
----------------------------------------------------------------------
diff --git a/container/openejb-core/src/test/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProviderTest.java b/container/openejb-core/src/test/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProviderTest.java
index d96dff3..ab92e5e 100644
--- a/container/openejb-core/src/test/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProviderTest.java
+++ b/container/openejb-core/src/test/java/org/apache/openejb/resource/heroku/HerokuDatabasePropertiesProviderTest.java
@@ -36,7 +36,12 @@ public class HerokuDatabasePropertiesProviderTest {
public void herokuToJava() {
SystemInstance.get().setProperty("DATABASE_URL", "postgres://user:pwd@host.com:5432/db");
assertEquals(
- new PropertiesBuilder().p("Password", "pwd").p("JdbcUrl", "jdbc:postgresql://host.com:5432/db").p("UserName", "user").build(),
+ new PropertiesBuilder()
+ .p("Password", "pwd")
+ .p("JdbcUrl", "jdbc:postgresql://host.com:5432/db")
+ .p("UserName", "user")
+ .p("JdbcDriver", "org.postgresql.Driver")
+ .build(),
new HerokuDatabasePropertiesProvider().provides());
}
}