diff --git a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java index 1bd20edd1e..0391f9d5be 100644 --- a/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java +++ b/jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java @@ -188,13 +188,20 @@ public abstract class AbstractTypedElementDefinition // [#5239] [#5762] [#6453] Don't rely on getSQLType() if (SQLDataType.DATE.equals(dataType.getSQLDataType())) { DataType forcedDataType = getDataType(db, SQLDataType.TIMESTAMP.getTypeName(), 0, 0); + String binding = DateAsTimestampBinding.class.getName(); + + + if (db.javaTimeTypes()) + binding = LocalDateAsLocalDateTimeBinding.class.getName(); + + result = new DefaultDataTypeDefinition( db, child.getSchema(), forcedDataType.getTypeName(), 0, 0, 0, result.isNullable(), result.getDefaultValue(), (Name) null, null, - db.javaTimeTypes() ? LocalDateAsLocalDateTimeBinding.class.getName() : DateAsTimestampBinding.class.getName() + binding ); } } diff --git a/jOOQ/src/main/java/org/jooq/impl/LocalDateAsLocalDateTimeBinding.java b/jOOQ/src/main/java/org/jooq/impl/LocalDateAsLocalDateTimeBinding.java index adee04b8b4..fd420bd89e 100644 --- a/jOOQ/src/main/java/org/jooq/impl/LocalDateAsLocalDateTimeBinding.java +++ b/jOOQ/src/main/java/org/jooq/impl/LocalDateAsLocalDateTimeBinding.java @@ -37,6 +37,8 @@ */ package org.jooq.impl; + + // ... import static org.jooq.impl.DSL.val; import static org.jooq.impl.Keywords.K_AS; @@ -137,3 +139,5 @@ public class LocalDateAsLocalDateTimeBinding implements Binding