HHH-19624 Test EDB with EDB drivers

.github/dependabot.yml

@@ -69,6 +69,7 @@ updates:
           - "org.hsqldb:hsqldb"
           - "org.apache.derby*"
           - "org.postgresql:*"
+          - "com.enterprisedb:*"
           - "com.mysql:mysql-connector-j"
           - "org.mariadb.jdbc:mariadb-java-client"
           - "com.oracle.database.*"

documentation/documentation.gradle

@@ -165,6 +165,7 @@ dependencies {
 	javadocClasspath jakartaLibs.jsonbApi
 	javadocClasspath libs.ant
 	javadocClasspath jdbcLibs.postgresql
+	javadocClasspath jdbcLibs.edb
 	javadocClasspath libs.jackson
 	javadocClasspath gradleApi()
 	javadocClasspath libs.jacksonXml

hibernate-core/hibernate-core.gradle

@@ -42,6 +42,7 @@ dependencies {
     compileOnly libs.jackson
     compileOnly libs.jacksonXml
     compileOnly jdbcLibs.postgresql
+    compileOnly jdbcLibs.edb
 
     testImplementation project(':hibernate-testing')
     testImplementation project(':hibernate-ant')

hibernate-core/src/main/java/org/hibernate/dialect/PostgreSQLDialect.java

@@ -206,6 +206,10 @@ public PostgreSQLDialect(DatabaseVersion version, PostgreSQLDriverKind driverKin
 		supportsMerge = version.isSameOrAfter( DatabaseVersion.make( 15, 0 ) );
 	}
 
+	public PostgreSQLDriverKind getDriverKind() {
+		return driverKind;
+	}
+
 	@Override
 	protected DatabaseVersion getMinimumSupportedVersion() {
 		return MINIMUM_VERSION;

hibernate-core/src/main/java/org/hibernate/dialect/type/PostgreSQLCastingIntervalSecondJdbcType.java

@@ -78,7 +78,7 @@ public void appendWriteExpression(
 			Dialect dialect) {
 		appender.append( '(' );
 		appender.append( writeExpression );
-		appender.append( "*interval'1 second)" );
+		appender.append( "*interval'1 second')" );
 	}
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/PostgreSQLMultipleTypesOtherContributorTest.java

@@ -16,15 +16,14 @@
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.boot.spi.MetadataBuilderContributor;
 import org.hibernate.boot.spi.MetadataBuilderImplementor;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.query.NativeQuery;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.SqlTypes;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.hibernate.testing.RequiresDialect;
-
 import org.hibernate.orm.test.id.usertype.inet.Inet;
 import org.hibernate.orm.test.id.usertype.inet.InetJavaType;
 import org.hibernate.orm.test.id.usertype.inet.InetJdbcType;
@@ -40,7 +39,7 @@
 /**
  * @author Vlad Mihalcea
  */
-@RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.IsPgJdbc.class)
 public class PostgreSQLMultipleTypesOtherContributorTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherContributorTest.java

@@ -10,11 +10,11 @@
 import org.hibernate.boot.MetadataBuilder;
 import org.hibernate.boot.spi.MetadataBuilderContributor;
 import org.hibernate.boot.spi.MetadataBuilderImplementor;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.hibernate.testing.RequiresDialect;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@@ -23,7 +23,7 @@
 /**
  * @author Vlad Mihalcea
  */
-@RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.IsPgJdbc.class)
 public class PostgreSQLInetTypesOtherContributorTest extends PostgreSQLInetTypesOtherTest {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/id/usertype/inet/PostgreSQLInetTypesOtherTest.java

@@ -9,13 +9,13 @@
 
 import org.hibernate.boot.spi.MetadataBuilderContributor;
 import org.hibernate.boot.spi.MetadataBuilderImplementor;
-import org.hibernate.dialect.PostgreSQLDialect;
 import org.hibernate.jpa.boot.internal.EntityManagerFactoryBuilderImpl;
 import org.hibernate.orm.test.jpa.BaseEntityManagerFunctionalTestCase;
 import org.hibernate.query.NativeQuery;
+import org.hibernate.testing.orm.junit.DialectFeatureChecks;
+import org.hibernate.testing.orm.junit.RequiresDialectFeature;
 import org.hibernate.type.spi.TypeConfiguration;
 
-import org.hibernate.testing.RequiresDialect;
 import org.junit.Test;
 
 import static org.hibernate.testing.transaction.TransactionUtil.doInJPA;
@@ -24,7 +24,7 @@
 /**
  * @author Vlad Mihalcea
  */
-@RequiresDialect(PostgreSQLDialect.class)
+@RequiresDialectFeature(feature = DialectFeatureChecks.IsPgJdbc.class)
 public class PostgreSQLInetTypesOtherTest extends BaseEntityManagerFunctionalTestCase {
 
 	@Override

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLFunctionProcedureTest.java

@@ -7,7 +7,6 @@
 import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Timestamp;
 import java.sql.Types;
 import java.time.LocalDateTime;
@@ -234,34 +233,6 @@ public void testFunctionWithJDBC() {
 		} );
 	}
 
-	@Test
-	public void testFunctionWithJDBCByName() {
-		doInJPA( this::entityManagerFactory, entityManager -> {
-			try {
-				Session session = entityManager.unwrap( Session.class );
-				Long phoneCount = session.doReturningWork( connection -> {
-					CallableStatement function = null;
-					try {
-						function = connection.prepareCall( "{ ? = call fn_count_phones(?) }" );
-						function.registerOutParameter( "phoneCount", Types.BIGINT );
-						function.setLong( "personId", 1L );
-						function.execute();
-						return function.getLong( 1 );
-					}
-					finally {
-						if ( function != null ) {
-							function.close();
-						}
-					}
-				} );
-				assertEquals( Long.valueOf( 2 ), phoneCount );
-			}
-			catch (Exception e) {
-				assertEquals( SQLFeatureNotSupportedException.class, e.getCause().getClass() );
-			}
-		} );
-	}
-
 	@Test
 	@JiraKey(value = "HHH-11863")
 	public void testSysRefCursorAsOutParameter() {

hibernate-core/src/test/java/org/hibernate/orm/test/procedure/PostgreSQLStoredProcedureTest.java

@@ -7,7 +7,6 @@
 import java.sql.CallableStatement;
 import java.sql.ResultSet;
 import java.sql.SQLException;
-import java.sql.SQLFeatureNotSupportedException;
 import java.sql.Statement;
 import java.sql.Timestamp;
 import java.sql.Types;
@@ -118,34 +117,6 @@ public void testStoredProcedureWithJDBC(EntityManagerFactoryScope scope) {
 		} );
 	}
 
-	@Test
-	public void testProcedureWithJDBCByName(EntityManagerFactoryScope scope) {
-		scope.inTransaction( entityManager -> {
-			try {
-				Session session = entityManager.unwrap( Session.class );
-				Long phoneCount = session.doReturningWork( connection -> {
-					CallableStatement procedure = null;
-					try {
-						procedure = connection.prepareCall( "{ call sp_count_phones(?,?) }" );
-						procedure.registerOutParameter( "phoneCount", Types.BIGINT );
-						procedure.setLong( "personId", 1L );
-						procedure.execute();
-						return procedure.getLong( 1 );
-					}
-					finally {
-						if ( procedure != null ) {
-							procedure.close();
-						}
-					}
-				} );
-				assertEquals( Long.valueOf( 2 ), phoneCount );
-			}
-			catch (Exception e) {
-				assertEquals( SQLFeatureNotSupportedException.class, e.getCause().getClass() );
-			}
-		} );
-	}
-
 	@Test
 	@JiraKey("HHH-11863")
 	@RequiresDialect(value = PostgreSQLDialect.class, majorVersion = 14, comment = "Stored procedure OUT parameters are only supported since version 14")

hibernate-core/src/test/java/org/hibernate/orm/test/type/PostgresIntervalSecondTest.java

@@ -11,6 +11,7 @@
 import org.hibernate.annotations.JdbcTypeCode;
 import org.hibernate.cfg.AvailableSettings;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.type.PostgreSQLCastingIntervalSecondJdbcType;
 import org.hibernate.dialect.type.PostgreSQLIntervalSecondJdbcType;
 import org.hibernate.metamodel.spi.MappingMetamodelImplementor;
 import org.hibernate.persister.entity.EntityPersister;
@@ -59,7 +60,7 @@ public void verifyMappings(SessionFactoryScope scope) {
 		assertThat( durationJdbcType ).isEqualTo( NumericJdbcType.INSTANCE );
 
 		final JdbcType intervalType = jdbcTypeRegistry.getDescriptor( SqlTypes.INTERVAL_SECOND );
-		assertThat( intervalType ).isOfAnyClassIn( PostgreSQLIntervalSecondJdbcType.class );
+		assertThat( intervalType ).isOfAnyClassIn( PostgreSQLIntervalSecondJdbcType.class, PostgreSQLCastingIntervalSecondJdbcType.class );
 
 		// a simple duration field with no overrides - so should be using a default JdbcType
 		assertThat( entityDescriptor.findAttributeMapping( "duration" )

hibernate-testing/src/main/java/org/hibernate/testing/jdbc/SharedDriverManagerConnectionProviderImpl.java

@@ -173,6 +173,49 @@ else if ( "org.postgresql.Driver".equals( config.driverClassName ) ) {
 				}
 			} );
 		}
+		else if ( "com.edb.Driver".equals( config.driverClassName ) ) {
+			validateConnections( c -> {
+				// Until pgjdbc provides a method for this out of the box, we have to do this manually
+				// See https://github.com/pgjdbc/pgjdbc/issues/3049
+				try {
+					final Class<?> pgConnection = Class.forName( "com.edb.jdbc.PgConnection" );
+					final Object connection = c.unwrap( pgConnection );
+					final Object typeInfo = pgConnection.getMethod( "getTypeInfo" ).invoke( connection );
+					final Class<?> typeInfoCacheClass = Class.forName( "com.edb.jdbc.TypeInfoCache" );
+					final Field oidToPgNameField = typeInfoCacheClass.getDeclaredField( "oidToPgName" );
+					final Field pgNameToOidField = typeInfoCacheClass.getDeclaredField( "pgNameToOid" );
+					final Field pgNameToSQLTypeField = typeInfoCacheClass.getDeclaredField( "pgNameToSQLType" );
+					final Field oidToSQLTypeField = typeInfoCacheClass.getDeclaredField( "oidToSQLType" );
+					oidToPgNameField.setAccessible( true );
+					pgNameToOidField.setAccessible( true );
+					pgNameToSQLTypeField.setAccessible( true );
+					oidToSQLTypeField.setAccessible( true );
+					//noinspection unchecked
+					final Map<Integer, String> oidToPgName = (Map<Integer, String>) oidToPgNameField.get( typeInfo );
+					//noinspection unchecked
+					final Map<String, Integer> pgNameToOid = (Map<String, Integer>) pgNameToOidField.get( typeInfo );
+					//noinspection unchecked
+					final Map<String, Integer> pgNameToSQLType = (Map<String, Integer>) pgNameToSQLTypeField.get( typeInfo );
+					//noinspection unchecked
+					final Map<Integer, Integer> oidToSQLType = (Map<Integer, Integer>) oidToSQLTypeField.get( typeInfo );
+					for ( Iterator<Map.Entry<String, Integer>> iter = pgNameToOid.entrySet().iterator(); iter.hasNext(); ) {
+						Map.Entry<String, Integer> entry = iter.next();
+						final String typeName = entry.getKey();
+						if ( !PGJDBC_STANDARD_TYPE_NAMES.contains( typeName ) ) {
+							final Integer oid = entry.getValue();
+							oidToPgName.remove( oid );
+							oidToSQLType.remove( oid );
+							pgNameToSQLType.remove( typeName );
+							iter.remove();
+						}
+					}
+					return true;
+				}
+				catch (Exception e) {
+					throw new RuntimeException( e );
+				}
+			} );
+		}
 	}
 
 	private static final Set<String> DRIVER_REQUIRES_NEW_CONNECTION_ON_TIMEZONE_CHANGE = Set.of(

hibernate-testing/src/main/java/org/hibernate/testing/junit4/CustomRunner.java

@@ -11,6 +11,7 @@
 import java.util.Comparator;
 import java.util.LinkedHashMap;
 import java.util.List;
+import java.util.Locale;
 
 import org.hibernate.dialect.Dialect;
 import org.hibernate.internal.util.StringHelper;
@@ -25,7 +26,9 @@
 import org.hibernate.testing.SkipForDialect;
 import org.hibernate.testing.SkipForDialects;
 import org.hibernate.testing.orm.junit.DialectContext;
+import org.hibernate.testing.orm.junit.DialectFeatureCheck;
 import org.hibernate.testing.orm.junit.DialectFilterExtension;
+import org.hibernate.testing.orm.junit.RequiresDialectFeatureGroup;
 import org.hibernate.testing.orm.junit.SkipForDialectGroup;
 import org.junit.BeforeClass;
 import org.junit.Ignore;
@@ -442,6 +445,30 @@ protected Ignore convertSkipToIgnore(FrameworkMethod frameworkMethod) {
 			}
 		}
 
+		Collection<org.hibernate.testing.orm.junit.RequiresDialectFeature> effectiveRequiresDialectFeatures = Helper.collectAnnotations(
+				org.hibernate.testing.orm.junit.RequiresDialectFeature.class,
+				RequiresDialectFeatureGroup.class,
+				frameworkMethod,
+				getTestClass()
+		);
+
+		for ( org.hibernate.testing.orm.junit.RequiresDialectFeature effectiveRequiresDialectFeature : effectiveRequiresDialectFeatures ) {
+			try {
+				final Class<? extends DialectFeatureCheck> featureClass = effectiveRequiresDialectFeature.feature();
+				final DialectFeatureCheck featureCheck = featureClass.getConstructor().newInstance();
+				boolean testResult = featureCheck.apply( dialect );
+				if ( effectiveRequiresDialectFeature.reverse() ) {
+					testResult = !testResult;
+				}
+				if ( !testResult ) {
+					return buildIgnore( effectiveRequiresDialectFeature );
+				}
+			}
+			catch (ReflectiveOperationException e) {
+				throw new RuntimeException( "Unable to instantiate DialectFeatureCheck class", e );
+			}
+		}
+
 		return null;
 	}
 
@@ -567,6 +594,14 @@ private Ignore buildIgnore(RequiresDialectFeature requiresDialectFeature) {
 		);
 	}
 
+	private Ignore buildIgnore(org.hibernate.testing.orm.junit.RequiresDialectFeature requiresDialectFeature) {
+		return buildIgnore(
+				String.format( Locale.ROOT, "Failed @RequiresDialectFeature [%s]", requiresDialectFeature.feature() ),
+				requiresDialectFeature.comment(),
+				requiresDialectFeature.jiraKey()
+		);
+	}
+
 	private boolean isMatch(Class<? extends Skip.Matcher> condition) {
 		try {
 			Skip.Matcher matcher = condition.newInstance();

hibernate-testing/src/main/java/org/hibernate/testing/orm/junit/DialectFeatureChecks.java

@@ -56,6 +56,7 @@
 import org.hibernate.dialect.NationalizationSupport;
 import org.hibernate.dialect.OracleDialect;
 import org.hibernate.dialect.PostgreSQLDialect;
+import org.hibernate.dialect.PostgreSQLDriverKind;
 import org.hibernate.dialect.SQLServerDialect;
 import org.hibernate.dialect.SpannerDialect;
 import org.hibernate.dialect.SybaseASEDialect;
@@ -997,6 +998,12 @@ public boolean apply(Dialect dialect) {
 		}
 	}
 
+	public static class IsPgJdbc implements DialectFeatureCheck {
+		public boolean apply(Dialect dialect) {
+			return dialect instanceof PostgreSQLDialect && ( (PostgreSQLDialect) dialect ).getDriverKind() == PostgreSQLDriverKind.PG_JDBC;
+		}
+	}
+
 	public static class SupportsCommentOn implements DialectFeatureCheck {
 		public boolean apply(Dialect dialect) {
 			return dialect.supportsCommentOn();

local-build-plugins/src/main/groovy/local.databases.gradle

@@ -88,13 +88,13 @@ ext {
             ],
             edb_ci : [
                     'db.dialect' : 'org.hibernate.dialect.PostgresPlusDialect',
-                    'jdbc.driver': 'org.postgresql.Driver',
+                    'jdbc.driver': 'com.edb.Driver',
                     'jdbc.user'  : 'hibernate_orm_test',
                     'jdbc.pass'  : 'hibernate_orm_test',
                     // Disable prepared statement caching due to https://www.postgresql.org/message-id/CAEcMXhmmRd4-%2BNQbnjDT26XNdUoXdmntV9zdr8%3DTu8PL9aVCYg%40mail.gmail.com
-                    'jdbc.url'   : 'jdbc:postgresql://' + dbHost + '/hibernate_orm_test?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn',
-                    'jdbc.datasource' : 'org.postgresql.Driver',
-//                        'jdbc.datasource' : 'org.postgresql.ds.PGSimpleDataSource',
+                    'jdbc.url'   : 'jdbc:edb://' + dbHost + '/hibernate_orm_test?preparedStatementCacheQueries=0&escapeSyntaxCallMode=callIfNoReturn',
+                    'jdbc.datasource' : 'com.edb.Driver',
+//                        'jdbc.datasource' : 'com.edb.ds.PGSimpleDataSource',
                     'connection.init_sql' : ''
             ],
             sybase_ci : [

local-build-plugins/src/main/groovy/local.java-module.gradle

@@ -77,6 +77,7 @@ dependencies {
     testRuntimeOnly jdbcLibs.derbyTools
     testRuntimeOnly jdbcLibs.hsqldb
     testRuntimeOnly jdbcLibs.postgresql
+    testRuntimeOnly jdbcLibs.edb
     testRuntimeOnly jdbcLibs.mssql
     testRuntimeOnly jdbcLibs.informix
     testRuntimeOnly jdbcLibs.cockroachdb

settings.gradle

@@ -231,6 +231,7 @@ dependencyResolutionManagement {
             def oracleVersion = version "oracle", "23.8.0.25.04"
             def oracleJacksonOsonExtension = version "oracleJacksonOsonExtension", "1.0.4"
             def pgsqlVersion = version "pgsql", "42.7.7"
+            def edbVersion = version "edb", "42.7.3.3"
             def gaussdbVersion = version "gaussdb", "506.0.0.b058"
             def sybaseVersion = version "sybase", "1.3.1"
             def tidbVersion = version "tidb", mysqlVersion
@@ -243,6 +244,7 @@ dependencyResolutionManagement {
             library( "derbyTools", "org.apache.derby", "derbytools" ).versionRef( derbyVersion )
             library( "postgresql", "org.postgresql", "postgresql" ).versionRef( pgsqlVersion )
             library( "cockroachdb", "org.postgresql", "postgresql" ).versionRef( pgsqlVersion )
+            library( "edb", "com.enterprisedb", "edb-jdbc" ).versionRef( edbVersion )
             library( "gaussdb", "com.huaweicloud.gaussdb", "gaussdbjdbc" ).versionRef( gaussdbVersion )
             library( "mysql", "com.mysql", "mysql-connector-j" ).versionRef( mysqlVersion )
             library( "tidb", "com.mysql", "mysql-connector-j" ).versionRef( tidbVersion )