feat: Decimal (22, 9), (35, 0), (31, 9), (35, 9)

Author: KirillKurdyukov

hibernate-dialect/pom.xml

@@ -42,7 +42,7 @@
         <log4j2.version>2.17.2</log4j2.version>
 
         <ydb.sdk.version>2.3.4</ydb.sdk.version>
-        <ydb.jdbc.version>2.3.2</ydb.jdbc.version>
+        <ydb.jdbc.version>2.3.3</ydb.jdbc.version>
     </properties>
 
     <licenses>

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

@@ -71,14 +71,15 @@
 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 static tech.ydb.hibernate.dialect.code.YdbJdbcCode.DECIMAL_SHIFT;
+import static tech.ydb.hibernate.dialect.types.LocalDateTimeJdbcType.JDBC_TYPE_DATETIME_CODE;
+
 /**
  * @author Kirill Kurdyukov
  */
 public class YdbDialect extends Dialect {
-    private static final int SHIFT_DECIMAL_CODE = 11000;
     private static final Exporter<ForeignKey> FOREIGN_KEY_EMPTY_EXPORTER = new EmptyExporter<>();
     private static final Exporter<Constraint> UNIQUE_KEY_EMPTY_EXPORTER = new EmptyExporter<>();
     private static final List<QueryHintHandler> QUERY_HINT_HANDLERS = List.of(
@@ -125,11 +126,14 @@ public void contributeTypes(TypeContributions typeContributions, ServiceRegistry
         typeContributions.contributeJdbcType(LocalDateJdbcType.INSTANCE);
         typeContributions.contributeJavaType(InstantJavaType.INSTANCE);
         typeContributions.contributeJdbcType(InstantJdbcType.INSTANCE);
+        typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_22_9));
+        typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_31_9));
+        typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_35_0));
+        typeContributions.contributeJdbcType(new DecimalJdbcType(YdbJdbcCode.DECIMAL_35_9));
 
         // custom jdbc codec
         typeContributions.contributeJdbcType(Uint8JdbcType.INSTANCE);
         typeContributions.contributeJavaType(BigDecimalJavaType.INSTANCE_22_9);
-
     }
 
     @Override
@@ -140,6 +144,10 @@ protected void registerColumnTypes(TypeContributions typeContributions, ServiceR
 
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DATETIME, "Datetime", "Datetime", this));
         ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.UINT8, "Uint8", "Uint8", 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));
+        ddlTypeRegistry.addDescriptor(new DdlTypeImpl(YdbJdbcCode.DECIMAL_35_9, "Decimal(35, 9)", "Decimal(35, 9)", this));
     }
 
     @Override
@@ -150,7 +158,7 @@ public JdbcType resolveSqlTypeDescriptor(
             int scale,
             JdbcTypeRegistry jdbcTypeRegistry) {
         if ((jdbcTypeCode == NUMERIC || jdbcTypeCode == DECIMAL) && (precision != 0 || scale != 0)) {
-            int sqlCode = SHIFT_DECIMAL_CODE + (precision + scale) * (precision + scale + 1) / 2 + precision;
+            int sqlCode = DECIMAL_SHIFT + (precision << 6) + scale;
 
             return DECIMAL_JDBC_TYPE_CACHE.computeIfAbsent(sqlCode, DecimalJdbcType::new);
         }
@@ -174,11 +182,7 @@ public void initializeFunctionRegistry(FunctionContributions functionContributio
 
         functionContributions.getFunctionRegistry().register(
                 "current_time",
-                new CurrentFunction(
-                        "current_time",
-                        currentTime(),
-                        localDateTimeType
-                )
+                new CurrentFunction("current_time", currentTime(), localDateTimeType)
         );
     }
 

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

@@ -125,9 +125,13 @@ public final class YdbJdbcCode {
      */
     public static final int JSON_DOCUMENT = 10023;
 
-    public static final int DECIMAL_22_9 = 10024;
+    public static final int DECIMAL_SHIFT = (1 << 14);
 
-    public static final int DECIMAL_31_9 = 10025;
+    public static final int DECIMAL_22_9 = DECIMAL_SHIFT + (22 << 6) + 9;
 
-    public static final int DECIMAL_35_9 = 10026;
+    public static final int DECIMAL_31_9 = DECIMAL_SHIFT + (31 << 6) + 9;
+
+    public static final int DECIMAL_35_0 = DECIMAL_SHIFT + (35 << 6);
+
+    public static final int DECIMAL_35_9 = DECIMAL_SHIFT + (35 << 6) + 9;
 }

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

@@ -18,6 +18,11 @@ public DecimalJdbcType(int sqlCode) {
         this.sqlCode = sqlCode;
     }
 
+    @Override
+    public int getJdbcTypeCode() {
+        return sqlCode;
+    }
+
     @Override
     public <X> ValueBinder<X> getBinder(final JavaType<X> javaType) {
         return new ValueBinder<>() {

hibernate-dialect/src/test/java/tech/ydb/hibernate/TestUtils.java

@@ -28,16 +28,10 @@ public static Configuration basedConfiguration() {
     }
 
     public static String jdbcUrl(YdbHelperExtension ydb) {
-        StringBuilder jdbc = new StringBuilder("jdbc:ydb:")
-                .append(ydb.useTls() ? "grpcs://" : "grpc://")
-                .append(ydb.endpoint())
-                .append(ydb.database());
-
-        if (ydb.authToken() != null) {
-            jdbc.append("?").append("token=").append(ydb.authToken());
-        }
-
-        return jdbc.toString();
+        return "jdbc:ydb:" +
+                (ydb.useTls() ? "grpcs://" : "grpc://") +
+                ydb.endpoint() +
+                ydb.database();
     }
 
     public static void inTransaction(Consumer<Session> work) {

hibernate-dialect/src/test/java/tech/ydb/hibernate/ydb_jdbc_code/TestEntity.java

@@ -28,9 +28,15 @@ public class TestEntity {
     @Column
     private BigDecimal default_bigDecimal;
 
-    @Column(precision = 3)
-    private BigDecimal bigDecimal3_0;
+    @Column
+    @JdbcTypeCode(YdbJdbcCode.DECIMAL_31_9)
+    private BigDecimal bigDecimal31_9;
 
-    @Column(precision = 35, columnDefinition = "DECIMAL (35, 0)")
+    @Column
+    @JdbcTypeCode(YdbJdbcCode.DECIMAL_35_0)
     private BigDecimal bigDecimal35_0;
+
+    @Column
+    @JdbcTypeCode(YdbJdbcCode.DECIMAL_35_9)
+    private BigDecimal bigDecimal35_9;
 }

hibernate-dialect/src/test/java/tech/ydb/hibernate/ydb_jdbc_code/YdbJdbcCodeTests.java

@@ -23,10 +23,26 @@ public class YdbJdbcCodeTests {
     public void integrationTests() {
         SESSION_FACTORY = basedConfiguration()
                 .addAnnotatedClass(TestEntity.class)
-                .setProperty(AvailableSettings.URL, jdbcUrl(ydb))
+                .setProperty(AvailableSettings.URL, jdbcUrl(ydb) + "?disablePrepareDataQuery=true")
                 .buildSessionFactory();
 
-        var testEntity = new TestEntity(1, new BigDecimal("123.000000000"), new BigDecimal(123), new BigDecimal("12345678123"));
+        /*
+        create table hibernate_test (
+            default_bigDecimal Decimal(22, 9),
+            bigDecimal31_9 Decimal(31, 9),
+            bigDecimal35_0 Decimal(35, 0),
+            bigDecimal35_9 Decimal(35, 9),
+            id Uint8 not null,
+            primary key (id)
+        )
+         */
+        var testEntity = new TestEntity(
+                1,
+                new BigDecimal("123.000000000"),
+                new BigDecimal("123.000000000"),
+                new BigDecimal("12345678123"),
+                new BigDecimal("12345678123.000000000")
+        );
 
         inTransaction(session -> session.persist(testEntity));
         inTransaction(session -> assertEquals(testEntity, session.find(TestEntity.class, 1)));