github/jooq
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[jOOQ/jOOQ#6497] Add LocalDateAsLocalDateTimeBinding to make <javaTimeTypes/> and <dateAsTimestamp/> work together

Browse Source
This commit is contained in:
Lukas Eder 2019-09-30 09:41:01 +02:00
parent dfbc259981
commit 3633b53f1e
5 changed files with 173 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
jOOQ-codegen/src/main/java/org/jooq/codegen/GenerationTool.java
View File

@ -602,6 +602,8 @@ public class GenerationTool {
if (d.isDateAsTimestamp() != null)
database.setDateAsTimestamp(d.isDateAsTimestamp());
if (g.getGenerate().isJavaTimeTypes() != null)
database.setJavaTimeTypes(g.getGenerate().isJavaTimeTypes());
if (d.isUnsignedTypes() != null)
database.setSupportsUnsignedTypes(d.isUnsignedTypes());
if (d.isIntegerDisplayWidths() != null)

11
jOOQ-meta/src/main/java/org/jooq/meta/AbstractDatabase.java
View File

@ -149,6 +149,7 @@ public abstract class AbstractDatabase implements Database {
private boolean integerDisplayWidths;
private boolean ignoreProcedureReturnValues;
private boolean dateAsTimestamp;
private boolean javaTimeTypes = true;
private List<CatalogMappingType> configuredCatalogs = new ArrayList<>();
private List<SchemaMappingType> configuredSchemata = new ArrayList<>();
private List<CustomType> configuredCustomTypes;
@ -1364,6 +1365,16 @@ public abstract class AbstractDatabase implements Database {
return dateAsTimestamp;
}
@Override
public final void setJavaTimeTypes(boolean javaTimeTypes) {
this.javaTimeTypes = javaTimeTypes;
}
@Override
public final boolean javaTimeTypes() {
return javaTimeTypes;
}
@Override
public final void setIncludeRelations(boolean includeRelations) {
this.includeRelations = includeRelations;

10
jOOQ-meta/src/main/java/org/jooq/meta/AbstractTypedElementDefinition.java
View File

@ -54,6 +54,7 @@ import org.jooq.exception.SQLDialectNotSupportedException;
import org.jooq.impl.DateAsTimestampBinding;
import org.jooq.impl.DefaultDataType;
import org.jooq.impl.EnumConverter;
import org.jooq.impl.LocalDateAsLocalDateTimeBinding;
import org.jooq.impl.SQLDataType;
import org.jooq.meta.jaxb.CustomType;
import org.jooq.meta.jaxb.ForcedType;
@ -187,7 +188,14 @@ public abstract class AbstractTypedElementDefinition<T extends Definition>
// [#5239] [#5762] [#6453] Don't rely on getSQLType()
if (SQLDataType.DATE.equals(dataType.getSQLDataType())) {
DataType<?> forcedDataType = getDataType(db, SQLDataType.TIMESTAMP.getTypeName(), 0, 0);
result = new DefaultDataTypeDefinition(db, child.getSchema(), forcedDataType.getTypeName(), 0, 0, 0, result.isNullable(), result.getDefaultValue(), (Name) null, null, DateAsTimestampBinding.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()
);
}
}
}

12
jOOQ-meta/src/main/java/org/jooq/meta/Database.java
View File

@ -884,6 +884,18 @@ public interface Database extends AutoCloseable {
*/
boolean dateAsTimestamp();
/**
* Whether <code>java.time</code> types are used, as opposed to
* <code>java.sql</code> types.
*/
void setJavaTimeTypes(boolean javaTimeTypes);
/**
* Whether <code>java.time</code> types are used, as opposed to
* <code>java.sql</code> types.
*/
boolean javaTimeTypes();
/**
* [#3559] Whether relations (i.e. constraints) should be included in this database.
*/

139
jOOQ/src/main/java/org/jooq/impl/LocalDateAsLocalDateTimeBinding.java Normal file
View File

@ -0,0 +1,139 @@
/*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* You may obtain a copy of the License at
*
* http://www.apache.org/licenses/LICENSE-2.0
*
* Unless required by applicable law or agreed to in writing, software
* distributed under the License is distributed on an "AS IS" BASIS,
* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
* See the License for the specific language governing permissions and
* limitations under the License.
*
* Other licenses:
* -----------------------------------------------------------------------------
* Commercial licenses for this work are available. These replace the above
* ASL 2.0 and offer limited warranties, support, maintenance, and commercial
* database integrations.
*
* For more information, please visit: http://www.jooq.org/licenses
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*
*/
package org.jooq.impl;
// ...
import static org.jooq.impl.DSL.val;
import static org.jooq.impl.Keywords.K_AS;
import static org.jooq.impl.Keywords.K_CAST;
import static org.jooq.impl.Keywords.K_DATE;
import java.sql.SQLException;
import java.time.LocalDateTime;
import org.jooq.Binding;
import org.jooq.BindingGetResultSetContext;
import org.jooq.BindingGetSQLInputContext;
import org.jooq.BindingGetStatementContext;
import org.jooq.BindingRegisterContext;
import org.jooq.BindingSQLContext;
import org.jooq.BindingSetSQLOutputContext;
import org.jooq.BindingSetStatementContext;
import org.jooq.Converter;
import org.jooq.Converters;
import org.jooq.RenderContext;
import org.jooq.SQLDialect;
/**
* A binding that implements the date-as-timestamp semantics of the jOOQ code
* generator.
*
* @author Lukas Eder
* @see <a
* href="https://github.com/jOOQ/jOOQ/issues/3369">https://github.com/jOOQ/jOOQ/issues/3369</a>
*/
public class LocalDateAsLocalDateTimeBinding implements Binding<LocalDateTime, LocalDateTime> {
/**
* Generated UID
*/
private static final long serialVersionUID = -7730882831126647188L;
private final Converter<LocalDateTime, LocalDateTime> converter;
private final Binding<LocalDateTime, LocalDateTime> delegate;
public LocalDateAsLocalDateTimeBinding() {
this.converter = Converters.identity(LocalDateTime.class);
this.delegate = DefaultBinding.binding(converter);
}
@Override
public final Converter<LocalDateTime, LocalDateTime> converter() {
return converter;
}
@Override
public final void sql(BindingSQLContext<LocalDateTime> ctx) throws SQLException {
delegate.sql(ctx);
}
@Override
public final void register(BindingRegisterContext<LocalDateTime> ctx) throws SQLException {
delegate.register(ctx);
}
@Override
public final void set(BindingSetStatementContext<LocalDateTime> ctx) throws SQLException {
delegate.set(ctx);
}
@Override
public final void set(BindingSetSQLOutputContext<LocalDateTime> ctx) throws SQLException {
delegate.set(ctx);
}
@Override
public final void get(BindingGetResultSetContext<LocalDateTime> ctx) throws SQLException {
delegate.get(ctx);
}
@Override
public final void get(BindingGetStatementContext<LocalDateTime> ctx) throws SQLException {
delegate.get(ctx);
}
@Override
public final void get(BindingGetSQLInputContext<LocalDateTime> ctx) throws SQLException {
delegate.get(ctx);
}
}