Skip to content

Commit f858b84

Browse files
committed
Upgrade JOOQ dialect to new version of JDBC
1 parent bc4e7c7 commit f858b84

File tree

3 files changed

+13
-10
lines changed

3 files changed

+13
-10
lines changed

jooq-dialect/pom.xml

+2-2
Original file line numberDiff line numberDiff line change
@@ -52,8 +52,8 @@
5252

5353
<jooq.version>3.19.0</jooq.version>
5454

55-
<ydb.sdk.version>2.2.6</ydb.sdk.version>
56-
<ydb.jdbc.version>2.2.3</ydb.jdbc.version>
55+
<ydb.sdk.version>2.3.8</ydb.sdk.version>
56+
<ydb.jdbc.version>2.3.7</ydb.jdbc.version>
5757
</properties>
5858

5959
<dependencies>

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

+7-6
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,15 @@
11
package tech.ydb.jooq.codegen;
22

3+
import java.math.BigDecimal;
4+
import java.util.ArrayList;
5+
import java.util.Collections;
6+
import java.util.List;
7+
38
import org.jooq.*;
49
import org.jooq.impl.DSL;
510
import org.jooq.meta.*;
611
import org.jooq.tools.JooqLogger;
12+
713
import tech.ydb.jdbc.YdbConnection;
814
import tech.ydb.jdbc.context.SchemeExecutor;
915
import tech.ydb.jdbc.context.YdbContext;
@@ -17,11 +23,6 @@
1723
import tech.ydb.table.description.TableIndex;
1824
import tech.ydb.table.settings.DescribeTableSettings;
1925

20-
import java.math.BigDecimal;
21-
import java.util.ArrayList;
22-
import java.util.Collections;
23-
import java.util.List;
24-
2526
public class YdbDatabase extends AbstractDatabase implements ResultQueryDatabase {
2627
private static final JooqLogger log = JooqLogger.getLogger(YdbDatabase.class);
2728

@@ -39,7 +40,7 @@ private YdbContext getContext() {
3940
}
4041

4142
private String getDatabaseName() {
42-
return getContext().getDatabase().substring(1);
43+
return getContext().getPrefixPath().substring(1);
4344
}
4445

4546
@Override

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

+4-2
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
import java.time.LocalDateTime;
77
import java.util.ArrayList;
88
import java.util.List;
9+
910
import org.jooq.Binding;
1011
import org.jooq.JSON;
1112
import org.jooq.JSONB;
@@ -20,7 +21,7 @@
2021
import org.jooq.types.UInteger;
2122
import org.jooq.types.ULong;
2223
import org.jooq.types.UShort;
23-
import tech.ydb.jdbc.YdbConst;
24+
2425
import tech.ydb.jdbc.impl.YdbTypes;
2526
import tech.ydb.jooq.binding.DateBinding;
2627
import tech.ydb.jooq.binding.DatetimeBinding;
@@ -36,6 +37,7 @@
3637
import tech.ydb.jooq.value.YSON;
3738
import tech.ydb.table.description.TableColumn;
3839
import tech.ydb.table.description.TableDescription;
40+
import tech.ydb.table.values.DecimalType;
3941
import tech.ydb.table.values.Type;
4042

4143
public class YdbTableDefinition extends AbstractTableDefinition {
@@ -71,7 +73,7 @@ protected List<ColumnDefinition> getElements0() {
7173
kind = type.getKind();
7274
}
7375

74-
int decimalDigits = kind == Type.Kind.DECIMAL ? YdbConst.SQL_DECIMAL_DEFAULT_PRECISION : 0;
76+
int decimalDigits = kind == Type.Kind.DECIMAL ? ((DecimalType) type).getPrecision(): 0;
7577

7678
String typeName = type.toString();
7779
Class<? extends Binding<?, ?>> binding = getBinding(typeName);

0 commit comments

Comments
 (0)