diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Interval64Binding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Interval64Binding.java index e1000c7..fbc36e5 100644 --- a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Interval64Binding.java +++ b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/Interval64Binding.java @@ -44,12 +44,12 @@ private static class IntervalConverter implements Converter { @Override public Duration from(ULong databaseObject) { - return Duration.of(databaseObject.longValue(), ChronoUnit.MICROS); + return databaseObject == null ? null : Duration.of(databaseObject.longValue(), ChronoUnit.MICROS); } @Override public ULong to(Duration userObject) { - return ULong.valueOf(TimeUnit.NANOSECONDS.toMicros(userObject.toNanos())); + return userObject == null ? null : ULong.valueOf(TimeUnit.NANOSECONDS.toMicros(userObject.toNanos())); } @Override diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java index a8345c6..d7bcfbb 100644 --- a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java +++ b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/IntervalBinding.java @@ -39,12 +39,12 @@ public void get(BindingGetResultSetContext ctx) throws SQLException { private static class IntervalConverter implements Converter { @Override public Duration from(YearToSecond databaseObject) { - return databaseObject.toDuration(); + return databaseObject == null ? null : databaseObject.toDuration(); } @Override public YearToSecond to(Duration userObject) { - return YearToSecond.valueOf(userObject); + return userObject == null ? null : YearToSecond.valueOf(userObject); } @Override diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java index a685f57..6b08e8e 100644 --- a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java +++ b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/TimestampBinding.java @@ -39,12 +39,12 @@ public void get(BindingGetResultSetContext ctx) throws SQLException { private static class TimestampConverter implements Converter { @Override public Instant from(LocalDateTime databaseObject) { - return databaseObject.toInstant(ZoneOffset.UTC); + return databaseObject == null ? null : databaseObject.toInstant(ZoneOffset.UTC); } @Override public LocalDateTime to(Instant userObject) { - return LocalDateTime.ofInstant(userObject, ZoneOffset.UTC); + return userObject == null ? null : LocalDateTime.ofInstant(userObject, ZoneOffset.UTC); } @Override diff --git a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java index bf90e04..abac59d 100644 --- a/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java +++ b/jooq-dialect/src/main/java/tech/ydb/jooq/binding/YsonBinding.java @@ -39,7 +39,7 @@ public void get(BindingGetResultSetContext ctx) throws SQLException { private static class YsonConverter implements Converter { @Override public YSON from(Object databaseObject) { - return (YSON) databaseObject; + return databaseObject == null ? null : (YSON) databaseObject; } @Override