Merge remote-tracking branch 'origin/main'

Author: KirillKurdyukov

hibernate-dialect/CHANGELOG.md

@@ -1,3 +1,8 @@
+## 1.5.0 ##
+
+- Support for `GenerationType.IDENTITY` with JDBC YDB Driver **2.3.11** and later.
+- Support for `Date32`, `Datetime64`, and `Timestamp64` YDB types.
+
 ## 1.4.1 ##
 
 - Deleted `InExpressionCountLimit`

hibernate-dialect/pom.xml

@@ -42,7 +42,7 @@
         <log4j2.version>2.17.2</log4j2.version>
 
         <ydb.sdk.version>2.3.13</ydb.sdk.version>
-        <ydb.jdbc.version>2.3.10</ydb.jdbc.version>
+        <ydb.jdbc.version>2.3.11</ydb.jdbc.version>
     </properties>
 
     <licenses>
@@ -145,7 +145,7 @@
                 <configuration>
                     <environmentVariables>
                         <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
-                        <YDB_DOCKER_FEATURE_FLAGS>enable_parameterized_decimal</YDB_DOCKER_FEATURE_FLAGS>
+                        <YDB_DOCKER_IMAGE>ydbplatform/local-ydb:trunk</YDB_DOCKER_IMAGE>
                     </environmentVariables>
                 </configuration>
             </plugin>

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

@@ -1,5 +1,8 @@
 package tech.ydb.hibernate.dialect;
 
+import java.time.Duration;
+import java.time.Instant;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.util.List;
 import java.util.concurrent.ConcurrentHashMap;
@@ -32,6 +35,7 @@
 import static org.hibernate.type.SqlTypes.DOUBLE;
 import static org.hibernate.type.SqlTypes.FLOAT;
 import static org.hibernate.type.SqlTypes.INTEGER;
+import static org.hibernate.type.SqlTypes.INTERVAL_SECOND;
 import static org.hibernate.type.SqlTypes.JSON;
 import static org.hibernate.type.SqlTypes.LONG32NVARCHAR;
 import static org.hibernate.type.SqlTypes.LONG32VARBINARY;
@@ -61,7 +65,6 @@
 import org.hibernate.type.descriptor.sql.internal.DdlTypeImpl;
 import org.hibernate.type.descriptor.sql.spi.DdlTypeRegistry;
 import tech.ydb.hibernate.dialect.code.YdbJdbcCode;
-import static tech.ydb.hibernate.dialect.code.YdbJdbcCode.DECIMAL_SHIFT;
 import tech.ydb.hibernate.dialect.exporter.EmptyExporter;
 import tech.ydb.hibernate.dialect.exporter.YdbIndexExporter;
 import tech.ydb.hibernate.dialect.hint.IndexQueryHintHandler;
@@ -78,8 +81,7 @@
 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;
-import tech.ydb.hibernate.dialect.types.Uint8JdbcType;
+import tech.ydb.hibernate.dialect.types.YdbJdbcType;
 
 /**
  * @author Kirill Kurdyukov
@@ -110,7 +112,7 @@ protected String columnType(int sqlTypeCode) {
             case DOUBLE -> "Double";
             case NUMERIC, DECIMAL -> "Decimal($p, $s)";
             case DATE -> "Date";
-            case JDBC_TYPE_DATETIME_CODE -> "Datetime";
+            case INTERVAL_SECOND -> "Interval";
             case TIME_WITH_TIMEZONE -> "TzDateTime";
             case TIMESTAMP, TIMESTAMP_UTC -> "Timestamp";
             case TIMESTAMP_WITH_TIMEZONE -> "TzTimestamp";
@@ -137,7 +139,12 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
         typeContributions.contributeJdbcType(InstantJdbcType.INSTANCE);
 
         // custom jdbc codec
-        typeContributions.contributeJdbcType(Uint8JdbcType.INSTANCE);
+        typeContributions.contributeJdbcType(new YdbJdbcType(YdbJdbcCode.UINT8, Integer.class));
+        typeContributions.contributeJdbcType(new YdbJdbcType(YdbJdbcCode.DATE_32, LocalDate.class));
+        typeContributions.contributeJdbcType(new YdbJdbcType(YdbJdbcCode.DATETIME_64, LocalDateTime.class));
+        typeContributions.contributeJdbcType(new YdbJdbcType(YdbJdbcCode.TIMESTAMP_64, Instant.class));
+        typeContributions.contributeJdbcType(new YdbJdbcType(YdbJdbcCode.INTERVAL_64, Duration.class));
+
         typeContributions.contributeJavaType(BigDecimalJavaType.INSTANCE_22_9);
         typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_22_9));
         typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_31_9));
@@ -152,8 +159,14 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
         final DdlTypeRegistry ddlTypeRegistry = typeContributions.getTypeConfiguration().getDdlTypeRegistry();
 
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(UUID, "Uuid", "Uuid", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(INTERVAL_SECOND, "Interval", "Interval", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.INTERVAL, "Interval", "Interval", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DATETIME, "Datetime", "Datetime", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.UINT8, "Uint8", "Uint8", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DATE_32, "Date32", "Date32", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DATETIME_64, "Datetime64", "Datetime64", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.TIMESTAMP_64, "Timestamp64", "Timestamp64", this));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.INTERVAL_64, "Interval64", "Interval64", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DECIMAL_22_9, "Decimal(22, 9)", "Decimal(22, 9)", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DECIMAL_31_9, "Decimal(31, 9)", "Decimal(31, 9)", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DECIMAL_35_0, "Decimal(35, 0)", "Decimal(35, 0)", this));
@@ -168,7 +181,7 @@ public JdbcType resolveSqlTypeDescriptor(
             int scale,
             JdbcTypeRegistry jdbcTypeRegistry) {
         if ((jdbcTypeCode == NUMERIC || jdbcTypeCode == DECIMAL) && (precision != 0 || scale != 0)) {
-            int sqlCode = DECIMAL_SHIFT + (precision << 6) + scale;
+            int sqlCode = ydbDecimal(precision, scale);
 
             return DECIMAL_JDBC_TYPE_CACHE.computeIfAbsent(sqlCode, DecimalJdbcType::new);
         }
@@ -385,4 +398,8 @@ public boolean supportsInsertReturning() {
     public boolean supportsInsertReturningGeneratedKeys() {
         return true;
     }
+
+    private static int ydbDecimal(int precision, int scale) {
+        return 1 << 14 + (precision << 6) + (scale & 0x111111);
+    }
 }

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/code/YdbConst.java

@@ -0,0 +1,16 @@
+package tech.ydb.hibernate.dialect.code;
+
+/**
+ * That class contain custom YDB type codes
+ * @see <a href="https://github.com/ydb-platform/ydb-jdbc-driver/blob/3d74021/jdbc/src/main/java/tech/ydb/jdbc/YdbConst.java#L8-L9">JDBC Driver constants</a>
+ * @see <a href="https://github.com/ydb-platform/ydb-jdbc-driver/blob/3d74021/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTypes.java#L37-L66">Primitive types</a>
+ * @see <a href="https://github.com/ydb-platform/ydb-jdbc-driver/blob/3d74021/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTypes.java#L138-L144">Decimal type</a>
+ *
+ * @author Kirill Kurdyukov
+ */
+final class YdbConst {
+    public static final int SQL_KIND_PRIMITIVE = 10000;
+    public static final int SQL_KIND_DECIMAL = 1 << 14; // 16384
+
+    private YdbConst() { };
+}

hibernate-dialect/src/main/java/tech/ydb/hibernate/dialect/code/YdbJdbcCode.java

@@ -8,133 +8,142 @@ public final class YdbJdbcCode {
     /**
      * Boolean value.
      */
-    public static final int BOOL = 10000;
+    public static final int BOOL = YdbConst.SQL_KIND_PRIMITIVE;
 
     /**
      * A signed integer. Acceptable values: from -2^7 to 2^7–1. Not supported for table columns
      */
-    public static final int INT8 = 10001;
+    public static final int INT8 = YdbConst.SQL_KIND_PRIMITIVE + 1;
 
     /**
      * An unsigned integer. Acceptable values: from 0 to 2^8–1.
      */
-    public static final int UINT8 = 10002;
+    public static final int UINT8 = YdbConst.SQL_KIND_PRIMITIVE + 2;
 
     /**
      * A signed integer. Acceptable values: from –2^15 to 2^15–1. Not supported for table columns
      */
-    public static final int INT16 = 10003;
+    public static final int INT16 = YdbConst.SQL_KIND_PRIMITIVE + 3;
 
     /**
      * An unsigned integer. Acceptable values: from 0 to 2^16–1. Not supported for table columns
      */
-    public static final int UINT16 = 10004;
+    public static final int UINT16 = YdbConst.SQL_KIND_PRIMITIVE + 4;
 
     /**
      * A signed integer. Acceptable values: from –2^31 to 2^31–1.
      */
-    public static final int INT32 = 10005;
+    public static final int INT32 = YdbConst.SQL_KIND_PRIMITIVE + 5;
 
     /**
      * An unsigned integer. Acceptable values: from 0 to 2^32–1.
      */
-    public static final int UINT32 = 10006;
+    public static final int UINT32 = YdbConst.SQL_KIND_PRIMITIVE + 6;
 
     /**
      * A signed integer. Acceptable values: from –2^63 to 2^63–1.
      */
-    public static final int INT64 = 10007;
+    public static final int INT64 = YdbConst.SQL_KIND_PRIMITIVE + 7;
 
     /**
      * An unsigned integer. Acceptable values: from 0 to 2^64–1.
      */
-    public static final int UINT64 = 10008;
+    public static final int UINT64 = YdbConst.SQL_KIND_PRIMITIVE + 8;
 
     /**
      * A real number with variable precision, 4 bytes in size. Can't be used in the primary key
      */
-    public static final int FLOAT = 10009;
+    public static final int FLOAT = YdbConst.SQL_KIND_PRIMITIVE + 9;
 
     /**
      * A real number with variable precision, 8 bytes in size. Can't be used in the primary key
      */
-    public static final int DOUBLE = 10010;
+    public static final int DOUBLE = YdbConst.SQL_KIND_PRIMITIVE + 10;
 
     /**
      * A binary data, synonym for YDB type String
      */
-    public static final int BYTES = 10011;
+    public static final int BYTES = YdbConst.SQL_KIND_PRIMITIVE + 11;
 
     /**
      * Text encoded in UTF-8, synonym for YDB type Utf8
      */
-    public static final int TEXT = 10012;
+    public static final int TEXT = YdbConst.SQL_KIND_PRIMITIVE + 12;
 
     /**
      * YSON in a textual or binary representation. Doesn't support matching, can't be used in the primary key
      */
-    public static final int YSON = 10013;
+    public static final int YSON = YdbConst.SQL_KIND_PRIMITIVE + 13;
 
     /**
      * JSON represented as text. Doesn't support matching, can't be used in the primary key
      */
-    public static final int JSON = 10014;
+    public static final int JSON = YdbConst.SQL_KIND_PRIMITIVE + 14;
 
     /**
      * Universally unique identifier UUID. Not supported for table columns
      */
-    public static final int UUID = 10015;
+    public static final int UUID = YdbConst.SQL_KIND_PRIMITIVE + 15;
 
     /**
      * Date, precision to the day
      */
-    public static final int DATE = 10016;
+    public static final int DATE = YdbConst.SQL_KIND_PRIMITIVE + 16;
 
     /**
      * Date/time, precision to the second
      */
-    public static final int DATETIME = 10017;
+    public static final int DATETIME = YdbConst.SQL_KIND_PRIMITIVE + 17;
 
     /**
      * Date/time, precision to the microsecond
      */
-    public static final int TIMESTAMP = 10018;
+    public static final int TIMESTAMP = YdbConst.SQL_KIND_PRIMITIVE + 18;
 
     /**
      * Time interval (signed), precision to microseconds
      */
-    public static final int INTERVAL = 10019;
+    public static final int INTERVAL = YdbConst.SQL_KIND_PRIMITIVE + 19;
 
     /**
      * Date with time zone label, precision to the day
      */
-    public static final int TZ_DATE = 10020;
+    public static final int TZ_DATE = YdbConst.SQL_KIND_PRIMITIVE + 20;
 
     /**
      * Date/time with time zone label, precision to the second
      */
-    public static final int TZ_DATETIME = 10021;
+    public static final int TZ_DATETIME = YdbConst.SQL_KIND_PRIMITIVE + 21;
 
     /**
      * Date/time with time zone label, precision to the microsecond
      */
-    public static final int TZ_TIMESTAMP = 10022;
+    public static final int TZ_TIMESTAMP = YdbConst.SQL_KIND_PRIMITIVE + 22;
 
     /**
      * JSON in an indexed binary representation. Doesn't support matching, can't be used in the primary key
      */
-    public static final int JSON_DOCUMENT = 10023;
+    public static final int JSON_DOCUMENT = YdbConst.SQL_KIND_PRIMITIVE + 23;
 
-    public static final int DECIMAL_SHIFT = (1 << 14);
+    public static final int DATE_32 = YdbConst.SQL_KIND_PRIMITIVE + 25;
+
+    public static final int DATETIME_64 = YdbConst.SQL_KIND_PRIMITIVE + 26;
+
+    public static final int TIMESTAMP_64 = YdbConst.SQL_KIND_PRIMITIVE + 27;
+
+    public static final int INTERVAL_64 = YdbConst.SQL_KIND_PRIMITIVE + 28;
+
+
+    // WARN! Attribute value must be constant!
 
     /**
-     *  <a href="https://github.com/ydb-platform/ydb-jdbc-driver/blob/v2.3.3/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTypes.java#L37-L66">link</a>
+     * <a href="https://github.com/ydb-platform/ydb-jdbc-driver/blob/v2.3.3/jdbc/src/main/java/tech/ydb/jdbc/impl/YdbTypes.java#L37-L66">link</a>
      */
-    public static final int DECIMAL_22_9 = DECIMAL_SHIFT + (22 << 6) + 9;
+    public static final int DECIMAL_22_9 = YdbConst.SQL_KIND_DECIMAL + (22 << 6) + 9;
 
-    public static final int DECIMAL_31_9 = DECIMAL_SHIFT + (31 << 6) + 9;
+    public static final int DECIMAL_31_9 = YdbConst.SQL_KIND_DECIMAL + (31 << 6) + 9;
 
-    public static final int DECIMAL_35_0 = DECIMAL_SHIFT + (35 << 6);
+    public static final int DECIMAL_35_0 = YdbConst.SQL_KIND_DECIMAL + (35 << 6);
 
-    public static final int DECIMAL_35_9 = DECIMAL_SHIFT + (35 << 6) + 9;
+    public static final int DECIMAL_35_9 = YdbConst.SQL_KIND_DECIMAL + (35 << 6) + 9;
 }

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

@@ -12,12 +12,13 @@
 import org.hibernate.type.descriptor.jdbc.BasicBinder;
 import org.hibernate.type.descriptor.jdbc.TimestampJdbcType;
 import org.hibernate.type.spi.TypeConfiguration;
+import tech.ydb.hibernate.dialect.code.YdbJdbcCode;
 
 /**
  * @author Kirill Kurdyukov
  */
 public class LocalDateTimeJdbcType extends TimestampJdbcType {
-    public static final int JDBC_TYPE_DATETIME_CODE = 10017;
+
     public static final LocalDateTimeJdbcType INSTANCE = new LocalDateTimeJdbcType();
 
     @Override
@@ -27,12 +28,12 @@ public String toString() {
 
     @Override
     public int getJdbcTypeCode() {
-        return JDBC_TYPE_DATETIME_CODE;
+        return YdbJdbcCode.DATETIME;
     }
 
     @Override
     public String getFriendlyName() {
-        return "DATETIME";
+        return "Datetime";
     }
 
     @Override
@@ -53,14 +54,14 @@ public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
             protected void doBind(PreparedStatement st, X value, int index, WrapperOptions options) throws SQLException {
                 final LocalDateTime localDateTime = javaType.unwrap(value, LocalDateTime.class, options);
 
-                st.setObject(index, localDateTime, JDBC_TYPE_DATETIME_CODE);
+                st.setObject(index, localDateTime, YdbJdbcCode.DATETIME);
             }
 
             @Override
             protected void doBind(CallableStatement st, X value, String name, WrapperOptions options) throws SQLException {
                 final LocalDateTime localDateTime = javaType.unwrap(value, LocalDateTime.class, options);
 
-                st.setObject(name, localDateTime, JDBC_TYPE_DATETIME_CODE);
+                st.setObject(name, localDateTime, YdbJdbcCode.DATETIME);
             }
         };
     }