From ac6eb7927fd28432decfcefb1028cce0e284e1e0 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 26 May 2017 14:58:16 +0200
Subject: [PATCH] [#5806] Add support for H2's TIMESTAMP WITH TIME ZONE data
 type

---
 jOOQ/src/main/java/org/jooq/impl/DSL.java     |  6 +-
 .../java/org/jooq/impl/DefaultBinding.java    |  8 +-
 .../java/org/jooq/util/h2/H2DataType.java     | 86 ++++++++++---------
 3 files changed, 55 insertions(+), 45 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/DSL.java b/jOOQ/src/main/java/org/jooq/impl/DSL.java
index 7a8622c916..33c109ea07 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DSL.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DSL.java
@@ -13871,7 +13871,7 @@ public class DSL {
      * UTC. Regardless of this fact, the result should be the same
      * {@link Instant} (in UTC) as the input.
      */
-    @Support({ POSTGRES })
+    @Support({ H2, POSTGRES })
     public static Field<OffsetDateTime> offsetDateTime(String value) {
         return Tools.field(Convert.convert(value, OffsetDateTime.class), OffsetDateTime.class);
     }
@@ -13885,7 +13885,7 @@ public class DSL {
      * UTC. Regardless of this fact, the result should be the same
      * {@link Instant} (in UTC) as the input.
      */
-    @Support({ POSTGRES })
+    @Support({ H2, POSTGRES })
     public static Field<OffsetDateTime> offsetDateTime(OffsetDateTime value) {
         return offsetDateTime(Tools.field(value));
     }
@@ -13899,7 +13899,7 @@ public class DSL {
      * UTC. Regardless of this fact, the result should be the same
      * {@link Instant} (in UTC) as the input.
      */
-    @Support({ POSTGRES })
+    @Support({ H2, POSTGRES })
     public static Field<OffsetDateTime> offsetDateTime(Field<OffsetDateTime> field) {
         return new DateOrTime<OffsetDateTime>(field, SQLDataType.OFFSETDATETIME);
     }
diff --git a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
index f3e58a27d9..41c2e08c02 100644
--- a/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
+++ b/jOOQ/src/main/java/org/jooq/impl/DefaultBinding.java
@@ -674,8 +674,14 @@ public class DefaultBinding<T, U> implements Binding<T, U> {
 
 
 
+                // [#5806] H2 doesn't support TIMESTAMP WITH TIME ZONE literals, see
+                if (family == H2) {
+                    render.visit(K_CAST).sql("('").sql(escape(string, render)).sql("' ")
+                          .visit(K_AS).sql(' ').visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(')');
+                }
+
                 // Some dialects implement SQL standard time literals
-                {
+                else {
                     render.visit(K_TIMESTAMP_WITH_TIME_ZONE).sql(" '").sql(escape(string, render)).sql('\'');
                 }
             }
diff --git a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
index 7f66fa1f4f..7df650b208 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
@@ -39,6 +39,7 @@ import java.math.BigInteger;
 import java.sql.Date;
 import java.sql.Time;
 import java.sql.Timestamp;
+import java.time.OffsetDateTime;
 import java.util.UUID;
 
 import org.jooq.DataType;
@@ -64,47 +65,50 @@ public class H2DataType {
     // Default SQL data types and synonyms thereof
     // -------------------------------------------------------------------------
 
-    public static final DataType<Byte>       TINYINT               = new DefaultDataType<Byte>(SQLDialect.H2, SQLDataType.TINYINT, "tinyint");
-    public static final DataType<Short>      SMALLINT              = new DefaultDataType<Short>(SQLDialect.H2, SQLDataType.SMALLINT, "smallint");
-    public static final DataType<Short>      INT2                  = new DefaultDataType<Short>(SQLDialect.H2, SQLDataType.SMALLINT, "int2");
-    public static final DataType<Integer>    INT                   = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "int");
-    public static final DataType<Integer>    INTEGER               = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "integer");
-    public static final DataType<Integer>    MEDIUMINT             = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "mediumint");
-    public static final DataType<Integer>    INT4                  = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "int4");
-    public static final DataType<Integer>    SIGNED                = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "signed");
-    public static final DataType<Boolean>    BOOLEAN               = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BOOLEAN, "boolean");
-    public static final DataType<Boolean>    BOOL                  = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BOOLEAN, "bool");
-    public static final DataType<Boolean>    BIT                   = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BIT, "bit");
-    public static final DataType<Long>       BIGINT                = new DefaultDataType<Long>(SQLDialect.H2, SQLDataType.BIGINT, "bigint");
-    public static final DataType<Long>       INT8                  = new DefaultDataType<Long>(SQLDialect.H2, SQLDataType.BIGINT, "int8");
-    public static final DataType<BigDecimal> DECIMAL               = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.DECIMAL, "decimal");
-    public static final DataType<BigDecimal> DEC                   = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.DECIMAL, "dec");
-    public static final DataType<BigDecimal> NUMBER                = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.NUMERIC, "number");
-    public static final DataType<BigDecimal> NUMERIC               = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.NUMERIC, "numeric");
-    public static final DataType<Double>     DOUBLE                = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.DOUBLE, "double");
-    public static final DataType<Double>     FLOAT                 = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float");
-    public static final DataType<Double>     FLOAT4                = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float4");
-    public static final DataType<Double>     FLOAT8                = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float8");
-    public static final DataType<Float>      REAL                  = new DefaultDataType<Float>(SQLDialect.H2, SQLDataType.REAL, "real");
-    public static final DataType<Time>       TIME                  = new DefaultDataType<Time>(SQLDialect.H2, SQLDataType.TIME, "time");
-    public static final DataType<Date>       DATE                  = new DefaultDataType<Date>(SQLDialect.H2, SQLDataType.DATE, "date");
-    public static final DataType<Timestamp>  TIMESTAMP             = new DefaultDataType<Timestamp>(SQLDialect.H2, SQLDataType.TIMESTAMP, "timestamp");
-    public static final DataType<Timestamp>  DATETIME              = new DefaultDataType<Timestamp>(SQLDialect.H2, SQLDataType.TIMESTAMP, "datetime");
-    public static final DataType<byte[]>     BINARY                = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.BINARY, "binary");
-    public static final DataType<byte[]>     VARBINARY             = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.VARBINARY, "varbinary");
-    public static final DataType<byte[]>     LONGVARBINARY         = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.LONGVARBINARY, "longvarbinary");
-    public static final DataType<byte[]>     BLOB                  = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.BLOB, "blob");
-    public static final DataType<Object>     OTHER                 = new DefaultDataType<Object>(SQLDialect.H2, SQLDataType.OTHER, "other");
-    public static final DataType<String>     VARCHAR               = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.VARCHAR, "varchar");
-    public static final DataType<String>     VARCHAR2              = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.VARCHAR, "varchar2");
-    public static final DataType<String>     CHAR                  = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CHAR, "char");
-    public static final DataType<String>     CHARACTER             = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CHAR, "character");
-    public static final DataType<String>     LONGVARCHAR           = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.LONGVARCHAR, "longvarchar");
-    public static final DataType<String>     CLOB                  = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CLOB, "clob");
-    public static final DataType<String>     NVARCHAR              = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NVARCHAR, "nvarchar");
-    public static final DataType<String>     NVARCHAR2             = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NVARCHAR, "nvarchar2");
-    public static final DataType<String>     NCHAR                 = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NCHAR, "nchar");
-    public static final DataType<String>     NCLOB                 = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NCLOB, "nclob");
+    public static final DataType<Byte>       TINYINT                   = new DefaultDataType<Byte>(SQLDialect.H2, SQLDataType.TINYINT, "tinyint");
+    public static final DataType<Short>      SMALLINT                  = new DefaultDataType<Short>(SQLDialect.H2, SQLDataType.SMALLINT, "smallint");
+    public static final DataType<Short>      INT2                      = new DefaultDataType<Short>(SQLDialect.H2, SQLDataType.SMALLINT, "int2");
+    public static final DataType<Integer>    INT                       = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "int");
+    public static final DataType<Integer>    INTEGER                   = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "integer");
+    public static final DataType<Integer>    MEDIUMINT                 = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "mediumint");
+    public static final DataType<Integer>    INT4                      = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "int4");
+    public static final DataType<Integer>    SIGNED                    = new DefaultDataType<Integer>(SQLDialect.H2, SQLDataType.INTEGER, "signed");
+    public static final DataType<Boolean>    BOOLEAN                   = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BOOLEAN, "boolean");
+    public static final DataType<Boolean>    BOOL                      = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BOOLEAN, "bool");
+    public static final DataType<Boolean>    BIT                       = new DefaultDataType<Boolean>(SQLDialect.H2, SQLDataType.BIT, "bit");
+    public static final DataType<Long>       BIGINT                    = new DefaultDataType<Long>(SQLDialect.H2, SQLDataType.BIGINT, "bigint");
+    public static final DataType<Long>       INT8                      = new DefaultDataType<Long>(SQLDialect.H2, SQLDataType.BIGINT, "int8");
+    public static final DataType<BigDecimal> DECIMAL                   = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.DECIMAL, "decimal");
+    public static final DataType<BigDecimal> DEC                       = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.DECIMAL, "dec");
+    public static final DataType<BigDecimal> NUMBER                    = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.NUMERIC, "number");
+    public static final DataType<BigDecimal> NUMERIC                   = new DefaultDataType<BigDecimal>(SQLDialect.H2, SQLDataType.NUMERIC, "numeric");
+    public static final DataType<Double>     DOUBLE                    = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.DOUBLE, "double");
+    public static final DataType<Double>     FLOAT                     = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float");
+    public static final DataType<Double>     FLOAT4                    = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float4");
+    public static final DataType<Double>     FLOAT8                    = new DefaultDataType<Double>(SQLDialect.H2, SQLDataType.FLOAT, "float8");
+    public static final DataType<Float>      REAL                      = new DefaultDataType<Float>(SQLDialect.H2, SQLDataType.REAL, "real");
+    public static final DataType<Time>       TIME                      = new DefaultDataType<Time>(SQLDialect.H2, SQLDataType.TIME, "time");
+    public static final DataType<Date>       DATE                      = new DefaultDataType<Date>(SQLDialect.H2, SQLDataType.DATE, "date");
+    public static final DataType<Timestamp>  TIMESTAMP                 = new DefaultDataType<Timestamp>(SQLDialect.H2, SQLDataType.TIMESTAMP, "timestamp");
+    public static final DataType<Timestamp>  DATETIME                  = new DefaultDataType<Timestamp>(SQLDialect.H2, SQLDataType.TIMESTAMP, "datetime");
+
+    public static final DataType<OffsetDateTime> TIMESTAMPWITHTIMEZONE = new DefaultDataType<OffsetDateTime>(SQLDialect.H2, SQLDataType.TIMESTAMPWITHTIMEZONE, "timestamp with time zone");
+
+    public static final DataType<byte[]>     BINARY                    = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.BINARY, "binary");
+    public static final DataType<byte[]>     VARBINARY                 = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.VARBINARY, "varbinary");
+    public static final DataType<byte[]>     LONGVARBINARY             = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.LONGVARBINARY, "longvarbinary");
+    public static final DataType<byte[]>     BLOB                      = new DefaultDataType<byte[]>(SQLDialect.H2, SQLDataType.BLOB, "blob");
+    public static final DataType<Object>     OTHER                     = new DefaultDataType<Object>(SQLDialect.H2, SQLDataType.OTHER, "other");
+    public static final DataType<String>     VARCHAR                   = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.VARCHAR, "varchar");
+    public static final DataType<String>     VARCHAR2                  = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.VARCHAR, "varchar2");
+    public static final DataType<String>     CHAR                      = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CHAR, "char");
+    public static final DataType<String>     CHARACTER                 = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CHAR, "character");
+    public static final DataType<String>     LONGVARCHAR               = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.LONGVARCHAR, "longvarchar");
+    public static final DataType<String>     CLOB                      = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.CLOB, "clob");
+    public static final DataType<String>     NVARCHAR                  = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NVARCHAR, "nvarchar");
+    public static final DataType<String>     NVARCHAR2                 = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NVARCHAR, "nvarchar2");
+    public static final DataType<String>     NCHAR                     = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NCHAR, "nchar");
+    public static final DataType<String>     NCLOB                     = new DefaultDataType<String>(SQLDialect.H2, SQLDataType.NCLOB, "nclob");
 
     // -------------------------------------------------------------------------
     // Compatibility types for supported SQLDialect.H2, SQLDataTypes