feat: full support datetime, date, timestamp types

hibernate-dialect/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.0.0 ##
+
+- Fixed: data time type converters
+
 ## 0.9.5 ##
 
 - Added query hint for view index for "select * from ... where" queries

hibernate-dialect/pom.xml

@@ -6,7 +6,7 @@
 
     <groupId>tech.ydb.dialects</groupId>
     <artifactId>hibernate-ydb-dialect</artifactId>
-    <version>0.9.5</version>
+    <version>1.0.0</version>
 
     <packaging>jar</packaging>
 
@@ -42,7 +42,7 @@
         <log4j2.version>2.17.2</log4j2.version>
 
         <ydb.sdk.version>2.2.6</ydb.sdk.version>
-        <ydb.jdbc.version>2.1.5</ydb.jdbc.version>
+        <ydb.jdbc.version>2.2.4</ydb.jdbc.version>
     </properties>
 
     <licenses>

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/YdbDialect.java

@@ -43,20 +43,27 @@
 import static org.hibernate.type.SqlTypes.NVARCHAR;
 import static org.hibernate.type.SqlTypes.REAL;
 import static org.hibernate.type.SqlTypes.SMALLINT;
-import static org.hibernate.type.SqlTypes.TIME;
 import static org.hibernate.type.SqlTypes.TIMESTAMP;
+import static org.hibernate.type.SqlTypes.TIMESTAMP_UTC;
 import static org.hibernate.type.SqlTypes.TIMESTAMP_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.TIME_WITH_TIMEZONE;
 import static org.hibernate.type.SqlTypes.TINYINT;
 import static org.hibernate.type.SqlTypes.VARBINARY;
 import static org.hibernate.type.SqlTypes.VARCHAR;
 import org.hibernate.type.StandardBasicTypes;
+import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
+import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import tech.ydb.hibernate.dialect.exporter.EmptyExporter;
 import tech.ydb.hibernate.dialect.exporter.YdbIndexExporter;
 import tech.ydb.hibernate.dialect.hint.IndexQueryHintHandler;
 import tech.ydb.hibernate.dialect.translator.YdbSqlAstTranslatorFactory;
+import tech.ydb.hibernate.dialect.types.InstantJavaType;
+import tech.ydb.hibernate.dialect.types.InstantJdbcType;
+import tech.ydb.hibernate.dialect.types.LocalDateJavaType;
+import tech.ydb.hibernate.dialect.types.LocalDateJdbcType;
 import tech.ydb.hibernate.dialect.types.LocalDateTimeJavaType;
 import tech.ydb.hibernate.dialect.types.LocalDateTimeJdbcType;
+import static tech.ydb.hibernate.dialect.types.LocalDateTimeJdbcType.JDBC_TYPE_DATETIME_CODE;
 
 /**
  * @author Kirill Kurdyukov
@@ -82,9 +89,9 @@ protected String columnType(int sqlTypeCode) {
             case DOUBLE -> "Double";
             case NUMERIC, DECIMAL -> "Decimal (22,9)"; // Fixed
             case DATE -> "Date";
-            case TIME -> "Datetime";
+            case JDBC_TYPE_DATETIME_CODE -> "Datetime";
             case TIME_WITH_TIMEZONE -> "TzDateTime";
-            case TIMESTAMP -> "Timestamp";
+            case TIMESTAMP, TIMESTAMP_UTC -> "Timestamp";
             case TIMESTAMP_WITH_TIMEZONE -> "TzTimestamp";
             case CHAR, VARCHAR, CLOB, NCHAR, NVARCHAR, NCLOB,
                     LONG32VARCHAR, LONG32NVARCHAR, LONGVARCHAR, LONGNVARCHAR -> "Text";
@@ -100,6 +107,19 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
 
         typeContributions.contributeJavaType(LocalDateTimeJavaType.INSTANCE);
         typeContributions.contributeJdbcType(LocalDateTimeJdbcType.INSTANCE);
+        typeContributions.contributeJavaType(LocalDateJavaType.INSTANCE);
+        typeContributions.contributeJdbcType(LocalDateJdbcType.INSTANCE);
+        typeContributions.contributeJavaType(InstantJavaType.INSTANCE);
+        typeContributions.contributeJdbcType(InstantJdbcType.INSTANCE);
+    }
+
+    @Override
+    protected void registerColumnTypes(TypeContributions typeContributions, ServiceRegistry serviceRegistry) {
+        super.registerColumnTypes(typeContributions, serviceRegistry);
+
+        final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
+
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(JDBC_TYPE_DATETIME_CODE, "Datetime", "Datetime", this));
     }
 
     @Override

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/types/InstantJavaType.java

@@ -0,0 +1,17 @@
+package tech.ydb.hibernate.dialect.types;
+
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+
+/**
+ * @author Kirill Kurdyukov
+ */
+public class InstantJavaType extends org.hibernate.type.descriptor.java.InstantJavaType {
+
+    public static final InstantJavaType INSTANCE = new InstantJavaType();
+
+    @Override
+    public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
+        return InstantJdbcType.INSTANCE;
+    }
+}

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/types/InstantJdbcType.java

@@ -0,0 +1,70 @@
+package tech.ydb.hibernate.dialect.types;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.Instant;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.TimestampUtcAsJdbcTimestampJdbcType;
+
+/**
+ * @author Kirill Kurdyukov
+ */
+public class InstantJdbcType extends TimestampUtcAsJdbcTimestampJdbcType {
+
+    public static final InstantJdbcType INSTANCE = new InstantJdbcType();
+
+    @Override
+    public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
+        return new BasicBinder<>(javaType, this) {
+            @Override
+            protected void doBind(
+                    PreparedStatement st,
+                    X value,
+                    int index,
+                    WrapperOptions wrapperOptions) throws SQLException {
+                final Instant instant = javaType.unwrap(value, Instant.class, wrapperOptions);
+
+                st.setObject(index, instant, Types.TIMESTAMP);
+            }
+
+            @Override
+            protected void doBind(
+                    CallableStatement st,
+                    X value,
+                    String name,
+                    WrapperOptions wrapperOptions)
+                    throws SQLException {
+                final Instant instant = javaType.unwrap(value, Instant.class, wrapperOptions);
+
+                st.setObject(name, instant, Types.TIMESTAMP);
+            }
+        };
+    }
+
+    @Override
+    public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+        return new ValueExtractor<>() {
+            @Override
+            public X extract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+                return javaType.wrap(rs.getObject(paramIndex), options);
+            }
+
+            @Override
+            public X extract(CallableStatement statement, int paramIndex, WrapperOptions options) throws SQLException {
+                return javaType.wrap(statement.getObject(paramIndex), options);
+            }
+
+            @Override
+            public X extract(CallableStatement statement, String paramName, WrapperOptions options) throws SQLException {
+                return javaType.wrap(statement.getObject(paramName), options);
+            }
+        };
+    }
+}

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/types/LocalDateJavaType.java

@@ -0,0 +1,17 @@
+package tech.ydb.hibernate.dialect.types;
+
+import org.hibernate.type.descriptor.jdbc.JdbcType;
+import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
+
+/**
+ * @author Kirill Kurdyukov
+ */
+public class LocalDateJavaType extends org.hibernate.type.descriptor.java.LocalDateJavaType {
+
+    public static final LocalDateJavaType INSTANCE = new LocalDateJavaType();
+
+    @Override
+    public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
+        return LocalDateJdbcType.INSTANCE;
+    }
+}

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/types/LocalDateJdbcType.java

@@ -0,0 +1,74 @@
+package tech.ydb.hibernate.dialect.types;
+
+import java.sql.CallableStatement;
+import java.sql.PreparedStatement;
+import java.sql.ResultSet;
+import java.sql.SQLException;
+import java.sql.Types;
+import java.time.LocalDate;
+import org.hibernate.type.descriptor.ValueBinder;
+import org.hibernate.type.descriptor.ValueExtractor;
+import org.hibernate.type.descriptor.WrapperOptions;
+import org.hibernate.type.descriptor.java.JavaType;
+import org.hibernate.type.descriptor.jdbc.BasicBinder;
+import org.hibernate.type.descriptor.jdbc.DateJdbcType;
+import org.hibernate.type.spi.TypeConfiguration;
+
+/**
+ * @author Kirill Kurdyukov
+ */
+public class LocalDateJdbcType extends DateJdbcType {
+
+    public static final LocalDateJdbcType INSTANCE = new LocalDateJdbcType();
+
+    @Override
+    public Class<?> getPreferredJavaTypeClass(WrapperOptions options) {
+        return LocalDate.class;
+    }
+
+    @Override
+    public <T> JavaType<T> getJdbcRecommendedJavaTypeMapping(Integer length, Integer scale,
+                                                             TypeConfiguration typeConfiguration) {
+        return typeConfiguration.getJavaTypeRegistry().getDescriptor(LocalDate.class);
+    }
+
+    @Override
+    public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
+        return new BasicBinder<>(javaType, this) {
+            @Override
+            protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
+                final LocalDate date = javaType.unwrap(value, LocalDate.class, options);
+
+                st.setObject(index, date, Types.DATE);
+            }
+
+            @Override
+            protected void doBind(CallableStatement st, X value, String name, WrapperOptions options)
+                    throws SQLException {
+                final LocalDate date = javaType.unwrap(value, LocalDate.class, options);
+
+                st.setObject(name, date, Types.DATE);
+            }
+        };
+    }
+
+    @Override
+    public <X> ValueExtractor<X> getExtractor(final JavaType<X> javaType) {
+        return new ValueExtractor<>() {
+            @Override
+            public X extract(ResultSet rs, int paramIndex, WrapperOptions options) throws SQLException {
+                return javaType.wrap(rs.getObject(paramIndex), options);
+            }
+
+            @Override
+            public X extract(CallableStatement statement, int paramIndex, WrapperOptions options) throws SQLException {
+                return javaType.wrap(statement.getObject(paramIndex), options);
+            }
+
+            @Override
+            public X extract(CallableStatement statement, String paramName, WrapperOptions options) throws SQLException {
+                return javaType.wrap(statement.getObject(paramName), options);
+            }
+        };
+    }
+}

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/types/LocalDateTimeJavaType.java

@@ -1,11 +1,7 @@
 package tech.ydb.hibernate.dialect.types;
 
-import jakarta.persistence.TemporalType;
-import java.sql.Types;
-import org.hibernate.type.descriptor.java.TemporalJavaType;
 import org.hibernate.type.descriptor.jdbc.JdbcType;
 import org.hibernate.type.descriptor.jdbc.JdbcTypeIndicators;
-import org.hibernate.type.spi.TypeConfiguration;
 
 /**
  * @author Kirill Kurdyukov
@@ -14,25 +10,8 @@ public class LocalDateTimeJavaType extends org.hibernate.type.descriptor.java.Lo
 
     public static final LocalDateTimeJavaType INSTANCE = new LocalDateTimeJavaType();
 
-    @Override
-    public TemporalType getPrecision() {
-        return TemporalType.TIME;
-    }
-
     @Override
     public JdbcType getRecommendedJdbcType(JdbcTypeIndicators context) {
-        return context.getJdbcType(Types.TIME);
-    }
-
-    @Override
-    @SuppressWarnings("unchecked")
-    protected <X> TemporalJavaType<X> forTimePrecision(TypeConfiguration typeConfiguration) {
-        return (TemporalJavaType<X>) this;
-    }
-
-    protected <X> TemporalJavaType<X> forTimestampPrecision(TypeConfiguration typeConfiguration) {
-        throw new UnsupportedOperationException(
-                this + " as `jakarta.persistence.TemporalType.TIMESTAMP` not supported"
-        );
+        return LocalDateTimeJdbcType.INSTANCE;
     }
 }