From e14c7f8740ec4776a388fc74b1f7482b3d67ec51 Mon Sep 17 00:00:00 2001 From: lvydra Date: Thu, 14 Sep 2023 14:44:00 +0200 Subject: [PATCH] [HHH-14676] PostgreSQLSkipAutoCommitTest ends up with a NPE on PostgreSQL Plus 13.1 --- .../jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java b/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java index 35e2794b9c..ff5ecfb699 100644 --- a/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java +++ b/hibernate-core/src/test/java/org/hibernate/test/resource/transaction/jdbc/autocommit/PostgreSQLSkipAutoCommitTest.java @@ -12,6 +12,7 @@ import org.hibernate.cfg.AvailableSettings; import org.hibernate.cfg.Environment; import org.hibernate.dialect.PostgreSQL81Dialect; +import org.hibernate.dialect.PostgresPlusDialect; import org.hibernate.testing.RequiresDialect; import org.hibernate.testing.util.ReflectionUtil; @@ -23,7 +24,12 @@ public class PostgreSQLSkipAutoCommitTest extends AbstractSkipAutoCommitTest { @Override protected DataSource dataSource() { - DataSource dataSource = ReflectionUtil.newInstance( "org.postgresql.ds.PGSimpleDataSource" ); + DataSource dataSource = null; + if (getDialect() instanceof PostgresPlusDialect) { + dataSource = ReflectionUtil.newInstance("com.edb.ds.PGSimpleDataSource"); + } else if (getDialect() instanceof PostgreSQL81Dialect) { + dataSource = ReflectionUtil.newInstance("org.postgresql.ds.PGSimpleDataSource"); + } ReflectionUtil.setProperty( dataSource, "url", Environment.getProperties().getProperty( AvailableSettings.URL ) ); ReflectionUtil.setProperty( dataSource, "user", Environment.getProperties().getProperty( AvailableSettings.USER ) ); ReflectionUtil.setProperty( dataSource, "password", Environment.getProperties().getProperty( AvailableSettings.PASS ) );