From a6f4bd7a147e79cefdd51d6fcc3a4f86ac0624a4 Mon Sep 17 00:00:00 2001 From: Marco Belladelli Date: Wed, 18 Sep 2024 15:30:40 +0200 Subject: [PATCH] HHH-18635 Avoid using `bigdatetime` on Sybase jconn when not necessary --- .../community/dialect/SybaseASELegacyDialect.java | 9 ++------- .../java/org/hibernate/dialect/SybaseASEDialect.java | 9 ++------- .../orm/test/jpa/query/NativeQueryWithDatetimesTest.java | 1 + 3 files changed, 5 insertions(+), 14 deletions(-) diff --git a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java index 784488b85cdd..987842c7e8ca 100644 --- a/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java +++ b/hibernate-community-dialects/src/main/java/org/hibernate/community/dialect/SybaseASELegacyDialect.java @@ -123,13 +123,8 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR // But with jTDS we can't use them as the driver can't handle the types if ( getVersion().isSameOrAfter( 15, 5 ) && getDriverKind() != SybaseDriverKind.JTDS ) { ddlTypeRegistry.addDescriptor( - CapacityDependentDdlType.builder( DATE, "bigdatetime", "bigdatetime", this ) - .withTypeCapacity( 3, "datetime" ) - .build() - ); - ddlTypeRegistry.addDescriptor( - CapacityDependentDdlType.builder( TIME, "bigdatetime", "bigdatetime", this ) - .withTypeCapacity( 3, "datetime" ) + CapacityDependentDdlType.builder( TIME, "bigtime", "bigtime", this ) + .withTypeCapacity( 3, "time" ) .build() ); ddlTypeRegistry.addDescriptor( diff --git a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java index a8fd7ecf6fc7..b290c6c708ed 100644 --- a/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java +++ b/hibernate-core/src/main/java/org/hibernate/dialect/SybaseASEDialect.java @@ -140,13 +140,8 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR // But with jTDS we can't use them as the driver can't handle the types if ( getDriverKind() != SybaseDriverKind.JTDS ) { ddlTypeRegistry.addDescriptor( - CapacityDependentDdlType.builder( DATE, "bigdatetime", "bigdatetime", this ) - .withTypeCapacity( 3, "datetime" ) - .build() - ); - ddlTypeRegistry.addDescriptor( - CapacityDependentDdlType.builder( TIME, "bigdatetime", "bigdatetime", this ) - .withTypeCapacity( 3, "datetime" ) + CapacityDependentDdlType.builder( TIME, "bigtime", "bigtime", this ) + .withTypeCapacity( 3, "time" ) .build() ); ddlTypeRegistry.addDescriptor( diff --git a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java index b72a7aaec519..32af80f47ad1 100644 --- a/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java +++ b/hibernate-core/src/test/java/org/hibernate/orm/test/jpa/query/NativeQueryWithDatetimesTest.java @@ -10,6 +10,7 @@ import jakarta.persistence.Table; import org.hibernate.dialect.OracleDialect; import org.hibernate.dialect.PostgresPlusDialect; + import org.hibernate.testing.orm.junit.EntityManagerFactoryScope; import org.hibernate.testing.orm.junit.Jpa; import org.hibernate.testing.orm.junit.SkipForDialect;