From f3cbf2e54431c3581940b0b99d7fefdcb6ef233d Mon Sep 17 00:00:00 2001 From: Steve Ebersole Date: Tue, 25 Apr 2023 07:28:34 -0500 Subject: [PATCH] HHH-16270 - Support for null Query parameters on Sybase (cherry picked from commit c3ddd869c969eb85bcce83d2640e0b620a78d090) --- .../src/main/java/org/hibernate/dialect/Dialect.java | 1 - .../src/main/java/org/hibernate/dialect/SybaseDialect.java | 6 +++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java index 991b46aa2f..e03e64e964 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/Dialect.java @@ -196,7 +196,6 @@ import org.hibernate.type.spi.TypeConfiguration; import org.jboss.logging.Logger; -import jakarta.persistence.GenerationType; import jakarta.persistence.TemporalType; import static java.lang.Math.ceil; diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java index 1804e57a3b..5b2c03ee4b 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseDialect.java @@ -52,7 +52,7 @@ import org.hibernate.type.JavaObjectType; import org.hibernate.type.descriptor.jdbc.BlobJdbcType; import org.hibernate.type.descriptor.jdbc.ClobJdbcType; import org.hibernate.type.descriptor.jdbc.JdbcType; -import org.hibernate.type.descriptor.jdbc.ObjectNullAsNullTypeJdbcType; +import org.hibernate.type.descriptor.jdbc.ObjectNullAsBinaryTypeJdbcType; import org.hibernate.type.descriptor.jdbc.TinyIntAsSmallIntJdbcType; import org.hibernate.type.descriptor.jdbc.spi.JdbcTypeRegistry; @@ -186,12 +186,12 @@ public class SybaseDialect extends AbstractTransactSQLDialect { jdbcTypeRegistry.addDescriptor( Types.BLOB, BlobJdbcType.PRIMITIVE_ARRAY_BINDING ); // Sybase requires a custom binder for binding untyped nulls with the NULL type - typeContributions.contributeJdbcType( ObjectNullAsNullTypeJdbcType.INSTANCE ); + typeContributions.contributeJdbcType( ObjectNullAsBinaryTypeJdbcType.INSTANCE ); // Until we remove StandardBasicTypes, we have to keep this typeContributions.contributeType( new JavaObjectType( - ObjectNullAsNullTypeJdbcType.INSTANCE, + ObjectNullAsBinaryTypeJdbcType.INSTANCE, typeContributions.getTypeConfiguration() .getJavaTypeRegistry() .getDescriptor( Object.class )