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

[jOOQ/jOOQ#8735] Support Offset[Date]Time and Instant for SQLite

Browse Source 
For SQLite the Java 8 time types Offset[Date|DateTime|Time] and Instant
are now supported. SQLite basically supports date and time data with
time zones as input. Returned values are however always in Zulu / UTC
time, as with some other dialects.
This commit is contained in:
Knut Wannheden 2019-06-05 08:44:08 +02:00
parent a67fbe5b79
commit 37727bee41
3 changed files with 54 additions and 34 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
jOOQ/src/main/java/org/jooq/impl/DSL.java
View File

@ -15769,7 +15769,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetTime> offsetTime(String value) {
return Tools.field(Convert.convert(value, OffsetTime.class));
}
@ -15783,7 +15783,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetTime> offsetTime(OffsetTime value) {
return Tools.field(value);
}
@ -15797,7 +15797,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetTime> offsetTime(Field<OffsetTime> field) {
return new DateOrTime<OffsetTime>(field, SQLDataType.OFFSETTIME);
}
@ -15811,7 +15811,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetDateTime> offsetDateTime(String value) {
return Tools.field(Convert.convert(value, OffsetDateTime.class));
}
@ -15825,7 +15825,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetDateTime> offsetDateTime(OffsetDateTime value) {
return Tools.field(value);
}
@ -15839,7 +15839,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<OffsetDateTime> offsetDateTime(Field<OffsetDateTime> field) {
return new DateOrTime<OffsetDateTime>(field, SQLDataType.OFFSETDATETIME);
}
@ -15853,7 +15853,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<Instant> instant(String value) {
return Tools.field(Convert.convert(value, Instant.class));
}
@ -15867,7 +15867,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<Instant> instant(Instant value) {
return Tools.field(value);
}
@ -15881,7 +15881,7 @@ public class DSL {
* UTC. Regardless of this fact, the result should be the same
* {@link Instant} (in UTC) as the input.
*/
@Support({ H2, HSQLDB, POSTGRES })
@Support({ H2, HSQLDB, POSTGRES, SQLITE })
public static Field<Instant> instant(Field<Instant> field) {
return new DateOrTime<Instant>(field, SQLDataType.INSTANT);
}

16
jOOQ/src/main/java/org/jooq/impl/DateOrTime.java
View File

@ -37,7 +37,6 @@
*/
package org.jooq.impl;
import static org.jooq.impl.DSL.keyword;
import static org.jooq.impl.Tools.castIfNeeded;
import org.jooq.Configuration;
@ -84,14 +83,13 @@ final class DateOrTime<T> extends AbstractFunction<T> {
return DSL.field("{" + name(getDataType()) + "}({0})", getDataType(), field);
case SQLITE: {
String name =
getDataType().isDate()
? "date"
: getDataType().isTime()
? "time"
: "datetime";
return DSL.field("{0}({1})", getDataType(), keyword(name), field);
if (getDataType().isDate())
return DSL.field("{date}({0})", getDataType(), field);
else if (getDataType().isTime())
// [#8733] No fractional seconds for time literals
return DSL.field("{time}({0})", getDataType(), field);
else
return DSL.field("{strftime}('%Y-%m-%d %H:%M:%f', {0})", getDataType(), field);
}
default:

54
jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
View File

@ -2656,14 +2656,22 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
final void sqlInline0(BindingSQLContext<U> ctx, OffsetDateTime value) {
SQLDialect family = ctx.family();
// [#5806] H2 doesn't support TIMESTAMP WITH TIME ZONE literals, see
if (family == H2)
ctx.render().visit(K_CAST).sql("('").sql(escape(format(value, family), ctx.render())).sql("' ")
.visit(K_AS).sql(' ').visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(')');
switch (family) {
// [#5806] H2 doesn't support TIMESTAMP WITH TIME ZONE literals, see
case H2:
ctx.render().visit(K_CAST).sql("('").sql(escape(format(value, family), ctx.render())).sql("' ")
.visit(K_AS).sql(' ').visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(')');
break;
// [#5895] HSQLDB derives the specific data type from the literal
else if (family == HSQLDB)
ctx.render().visit(K_TIMESTAMP).sql(" '").sql(escape(format(value, family), ctx.render())).sql('\'');
// [#5895] HSQLDB derives the specific data type from the literal
case HSQLDB:
ctx.render().visit(K_TIMESTAMP).sql(" '").sql(escape(format(value, family), ctx.render())).sql('\'');
break;
// [#8735] SQLite renders as ISO formatted string literals
case SQLITE:
ctx.render().sql('\'').sql(escape(format(value, family), ctx.render())).sql('\'');
break;
@ -2675,9 +2683,14 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
// Some dialects implement SQL standard time literals
else
ctx.render().visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(" '").sql(escape(format(value, family), ctx.render())).sql('\'');
// Some dialects implement SQL standard time literals
default:
ctx.render().visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(" '").sql(escape(format(value, family), ctx.render())).sql('\'');
break;
}
}
@Override
@ -2826,9 +2839,16 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
@Override
final void sqlInline0(BindingSQLContext<U> ctx, OffsetTime value) {
// [#5895] HSQLDB derives the specific data type from the literal
if (ctx.family() == HSQLDB)
ctx.render().visit(K_TIME).sql(" '").sql(escape(format(value), ctx.render())).sql('\'');
switch (ctx.family()) {
// [#5895] HSQLDB derives the specific data type from the literal
case HSQLDB:
ctx.render().visit(K_TIME).sql(" '").sql(escape(format(value), ctx.render())).sql('\'');
break;
// [#8735] SQLite renders as ISO formatted string literals
case SQLITE:
ctx.render().sql('\'').sql(escape(format(value), ctx.render())).sql('\'');
break;
@ -2836,9 +2856,11 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
// Some dialects implement SQL standard time literals
else
ctx.render().visit(K_TIME_WITH_TIME_ZONE).sql(" '").sql(escape(format(value), ctx.render())).sql('\'');
// Some dialects implement SQL standard time literals
default:
ctx.render().visit(K_TIME_WITH_TIME_ZONE).sql(" '").sql(escape(format(value), ctx.render())).sql('\'');
break;
}
}
@Override