feat: supported UUID type in JOOQ YDB dialect (#184)

Author: KirillKurdyukov

jooq-dialect/CHANGELOG.md

@@ -1,3 +1,7 @@
+## 1.1.1 ##
+
+- Supported UUID YDB Type
+
 ## 1.1.0 ##
 - Upgrade to new version of JDBC & SDK
 

jooq-dialect/pom.xml

@@ -4,7 +4,7 @@
 
     <groupId>tech.ydb.dialects</groupId>
     <artifactId>jooq-ydb-dialect</artifactId>
-    <version>1.1.0</version>
+    <version>1.1.1</version>
 
     <name>YDB JOOQ Dialect module</name>
     <description>YDB JOOQ Dialect module</description>
@@ -134,7 +134,6 @@
                 <configuration>
                     <environmentVariables>
                         <TESTCONTAINERS_REUSE_ENABLE>true</TESTCONTAINERS_REUSE_ENABLE>
-                        <YDB_DOCKER_IMAGE>cr.yandex/yc/yandex-docker-local-ydb:latest</YDB_DOCKER_IMAGE>
                     </environmentVariables>
                 </configuration>
             </plugin>

jooq-dialect/src/main/java/tech/ydb/jooq/YdbTypes.java

@@ -52,7 +52,8 @@ public static DataType<BigDecimal> DECIMAL(int precision, int scale) {
     public static final DataType<org.jooq.JSON> JSON = newDataType(SQLDataType.JSON, "json", new JsonBinding());
     public static final DataType<org.jooq.JSONB> JSONDOCUMENT = newDataType(SQLDataType.JSONB, "jsondocument", new JsonDocumentBinding());
     public static final DataType<YSON> YSON = newDataType(SQLDataType.OTHER, "yson", new YsonBinding());
-    public static final DataType<java.util.UUID> UUID = newDataType(SQLDataType.UUID, "uuid");
+
+    public static final DataType<java.util.UUID> UUID = newDataType(SQLDataType.UUID, "uuid", new UuidBinding());
 
     public static final DataType<LocalDate> DATE = newDataType(SQLDataType.LOCALDATE, "date", new DateBinding());
     public static final DataType<LocalDateTime> DATETIME = newDataType(SQLDataType.LOCALDATETIME, "datetime", new DatetimeBinding());

jooq-dialect/src/main/java/tech/ydb/jooq/binding/UuidBinding.java

@@ -0,0 +1,38 @@
+package tech.ydb.jooq.binding;
+
+import java.sql.SQLException;
+import java.util.UUID;
+import org.jooq.BindingGetResultSetContext;
+import org.jooq.BindingSetStatementContext;
+import org.jooq.Converter;
+import org.jooq.impl.AbstractBinding;
+import org.jooq.impl.IdentityConverter;
+import static tech.ydb.jooq.binding.BindingTools.indexType;
+import tech.ydb.table.values.PrimitiveType;
+
+/**
+ * @author Kirill Kurdyukov
+ */
+public class UuidBinding extends AbstractBinding<UUID, UUID> {
+
+    private static final int INDEX_TYPE = indexType(PrimitiveType.Uuid);
+
+    @Override
+    public Converter<UUID, UUID> converter() {
+        return new IdentityConverter<>(UUID.class);
+    }
+
+    @Override
+    public void set(BindingSetStatementContext<UUID> ctx) throws SQLException {
+        if (ctx.value() == null) {
+            ctx.statement().setNull(ctx.index(), INDEX_TYPE);
+        } else {
+            ctx.statement().setObject(ctx.index(), ctx.value(), INDEX_TYPE);
+        }
+    }
+
+    @Override
+    public void get(BindingGetResultSetContext<UUID> ctx) throws SQLException {
+        ctx.value((UUID) ctx.resultSet().getObject(ctx.index()));
+    }
+}

jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbDatabase.java

@@ -4,12 +4,28 @@
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.List;
-
-import org.jooq.*;
+import org.jooq.DSLContext;
+import org.jooq.Record12;
+import org.jooq.Record4;
+import org.jooq.Record5;
+import org.jooq.Record6;
+import org.jooq.ResultQuery;
 import org.jooq.impl.DSL;
-import org.jooq.meta.*;
-import org.jooq.tools.JooqLogger;
-
+import org.jooq.meta.AbstractDatabase;
+import org.jooq.meta.ArrayDefinition;
+import org.jooq.meta.CatalogDefinition;
+import org.jooq.meta.DefaultRelations;
+import org.jooq.meta.DomainDefinition;
+import org.jooq.meta.EnumDefinition;
+import org.jooq.meta.IndexDefinition;
+import org.jooq.meta.PackageDefinition;
+import org.jooq.meta.ResultQueryDatabase;
+import org.jooq.meta.RoutineDefinition;
+import org.jooq.meta.SchemaDefinition;
+import org.jooq.meta.SequenceDefinition;
+import org.jooq.meta.TableDefinition;
+import org.jooq.meta.UDTDefinition;
+import org.jooq.meta.XMLSchemaCollectionDefinition;
 import tech.ydb.jdbc.YdbConnection;
 import tech.ydb.jdbc.context.SchemeExecutor;
 import tech.ydb.jdbc.context.YdbContext;
@@ -24,7 +40,6 @@
 import tech.ydb.table.settings.DescribeTableSettings;
 
 public class YdbDatabase extends AbstractDatabase implements ResultQueryDatabase {
-    private static final JooqLogger log = JooqLogger.getLogger(YdbDatabase.class);
 
     public YdbDatabase() {
         YdbTypes.initialize();

jooq-dialect/src/main/java/tech/ydb/jooq/codegen/YdbTableDefinition.java

@@ -33,6 +33,7 @@
 import tech.ydb.jooq.binding.Uint32Binding;
 import tech.ydb.jooq.binding.Uint64Binding;
 import tech.ydb.jooq.binding.Uint8Binding;
+import tech.ydb.jooq.binding.UuidBinding;
 import tech.ydb.jooq.binding.YsonBinding;
 import tech.ydb.jooq.value.YSON;
 import tech.ydb.table.description.TableColumn;
@@ -73,7 +74,7 @@ protected List<ColumnDefinition> getElements0() {
                 kind = type.getKind();
             }
 
-            int decimalDigits = kind == Type.Kind.DECIMAL ? ((DecimalType) type).getPrecision(): 0;
+            int scale = kind == Type.Kind.DECIMAL ? ((DecimalType) type).getScale() : 0;
 
             String typeName = type.toString();
             Class<? extends Binding<?, ?>> binding = getBinding(typeName);
@@ -85,7 +86,7 @@ protected List<ColumnDefinition> getElements0() {
                     typeName,
                     YdbTypes.getSqlPrecision(type),
                     YdbTypes.getSqlPrecision(type),
-                    decimalDigits,
+                    scale,
                     isNullable,
                     null,
                     DSL.name(typeName),
@@ -130,6 +131,7 @@ public TableDescription getTableDescription() {
             case "Uint32" -> Uint32Binding.class;
             case "Uint64" -> Uint64Binding.class;
             case "Yson" -> YsonBinding.class;
+            case "Uuid" -> UuidBinding.class;
             default -> null;
         };
     }

jooq-dialect/src/test/java/jooq/generated/ydb/default_schema/tables/DateTable.java

@@ -98,6 +98,7 @@ public static void beforeAll() {
                 .column("first", YdbTypes.JSON)
                 .column("second", YdbTypes.JSONDOCUMENT)
                 .column("third", YdbTypes.YSON)
+                .column("uuid", YdbTypes.UUID)
                 .primaryKey("id")
                 .execute();
 

jooq-dialect/src/test/java/jooq/generated/ydb/default_schema/tables/HardTable.java

@@ -1,6 +1,7 @@
 package tech.ydb.jooq;
 
 import java.util.List;
+import java.util.UUID;
 import static jooq.generated.ydb.default_schema.Tables.HARD_TABLE;
 import static jooq.generated.ydb.default_schema.Tables.SERIES;
 import jooq.generated.ydb.default_schema.tables.records.HardTableRecord;
@@ -71,10 +72,12 @@ public void testConditionalInsert() {
     @Test
     public void testInsertJsonTypes() {
         HardTableRecord record = new HardTableRecord();
+
         record.setId("test-id".getBytes());
         record.setFirst(JSON.valueOf("{\"key\": \"value\"}"));
         record.setSecond(JSONB.valueOf("{\"list\": [1, 2, 3]}"));
         record.setThird(YSON.valueOf("{\"boolean\" = true}"));
+        record.setUuid(UUID.randomUUID());
 
         dsl.insertInto(HARD_TABLE)
                 .set(record)
@@ -84,6 +87,11 @@ public void testInsertJsonTypes() {
                 .where(HARD_TABLE.ID.eq("test-id".getBytes()))
                 .fetch();
 
+        Result<HardTableRecord> recordsByUuid = dsl.selectFrom(HARD_TABLE)
+                .where(HARD_TABLE.UUID.eq(record.getUuid()))
+                .fetch();
+
         assertEquals(List.of(record), records);
+        assertEquals(List.of(record), recordsByUuid);
     }
 }