You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rz...@apache.org on 2023/06/27 08:44:57 UTC

[tomee] 01/01: TOMEE-4226 - Check for modern PostgreSQL driver, if JDBCUrl is not specified in @DataSourceDefinition

This is an automated email from the ASF dual-hosted git repository.

rzo1 pushed a commit to branch TOMEE-4226-8.x
in repository https://gitbox.apache.org/repos/asf/tomee.git

commit 3036f3aa53c2220839db9ca47e7e2d996560d7c2
Author: Richard Zowalla <rz...@apache.org>
AuthorDate: Tue Jun 27 10:44:45 2023 +0200

    TOMEE-4226 - Check for modern PostgreSQL driver, if JDBCUrl is not specified in @DataSourceDefinition
---
 .../src/main/java/org/apache/openejb/config/AutoConfig.java            | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
index cec361397e..6cb68d2295 100644
--- a/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
+++ b/container/openejb-core/src/main/java/org/apache/openejb/config/AutoConfig.java
@@ -1135,7 +1135,8 @@ public class AutoConfig implements DynamicDeployer, JndiConstants {
             return String.format("jdbc:mysql://%s:%s/%s", serverName, port, databaseName);
         }
 
-        if (driver.equals("com.postgresql.jdbc.Driver")) {
+        if (driver.startsWith("com.postgresql")
+                || driver.startsWith("org.postgresql")) {
             return String.format("jdbc:postgresql://%s:%s/%s", serverName, port, databaseName);
         }