From ca2f784d3d9b90f12b3e1a8b672e7be221fcf5ba Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Tue, 28 Jul 2020 14:47:57 +0200
Subject: [PATCH] [jOOQ/jOOQ#9188] Cannot use DayToSecond intervals in H2, for
 intervals bigger than 99 days

---
 .../java/org/jooq/util/h2/H2DataType.java     | 92 ++++++++++---------
 1 file changed, 48 insertions(+), 44 deletions(-)

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 242011e833..ba302024d2 100644
--- a/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
+++ b/jOOQ/src/main/java/org/jooq/util/h2/H2DataType.java
@@ -54,10 +54,12 @@ import org.jooq.Result;
 import org.jooq.SQLDialect;
 import org.jooq.impl.DefaultDataType;
 import org.jooq.impl.SQLDataType;
+import org.jooq.types.DayToSecond;
 import org.jooq.types.UByte;
 import org.jooq.types.UInteger;
 import org.jooq.types.ULong;
 import org.jooq.types.UShort;
+import org.jooq.types.YearToMonth;
 
 /**
  * Supported data types for the {@link SQLDialect#H2} dialect
@@ -82,53 +84,55 @@ public class H2DataType {
     // Default SQL data types and synonyms thereof
     // -------------------------------------------------------------------------
 
-    public static final DataType<Byte>       TINYINT                   = new DefaultDataType<>(FAMILY, SQLDataType.TINYINT, "tinyint");
-    public static final DataType<Short>      SMALLINT                  = new DefaultDataType<>(FAMILY, SQLDataType.SMALLINT, "smallint");
-    public static final DataType<Short>      INT2                      = new DefaultDataType<>(FAMILY, SQLDataType.SMALLINT, "int2");
-    public static final DataType<Integer>    INT                       = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "int");
-    public static final DataType<Integer>    INTEGER                   = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "integer");
-    public static final DataType<Integer>    MEDIUMINT                 = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "mediumint");
-    public static final DataType<Integer>    INT4                      = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "int4");
-    public static final DataType<Integer>    SIGNED                    = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "signed");
-    public static final DataType<Boolean>    BOOLEAN                   = new DefaultDataType<>(FAMILY, SQLDataType.BOOLEAN, "boolean");
-    public static final DataType<Boolean>    BOOL                      = new DefaultDataType<>(FAMILY, SQLDataType.BOOLEAN, "bool");
-    public static final DataType<Boolean>    BIT                       = new DefaultDataType<>(FAMILY, SQLDataType.BIT, "bit");
-    public static final DataType<Long>       BIGINT                    = new DefaultDataType<>(FAMILY, SQLDataType.BIGINT, "bigint");
-    public static final DataType<Long>       INT8                      = new DefaultDataType<>(FAMILY, SQLDataType.BIGINT, "int8");
-    public static final DataType<BigDecimal> DECIMAL                   = new DefaultDataType<>(FAMILY, SQLDataType.DECIMAL, "decimal(p, s)");
-    public static final DataType<BigDecimal> DEC                       = new DefaultDataType<>(FAMILY, SQLDataType.DECIMAL, "dec(p, s)");
-    public static final DataType<BigDecimal> NUMBER                    = new DefaultDataType<>(FAMILY, SQLDataType.NUMERIC, "number(p, s)");
-    public static final DataType<BigDecimal> NUMERIC                   = new DefaultDataType<>(FAMILY, SQLDataType.NUMERIC, "numeric(p, s)");
-    public static final DataType<Double>     DOUBLE                    = new DefaultDataType<>(FAMILY, SQLDataType.DOUBLE, "double");
-    public static final DataType<Double>     FLOAT                     = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float");
-    public static final DataType<Double>     FLOAT4                    = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float4");
-    public static final DataType<Double>     FLOAT8                    = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float8");
-    public static final DataType<Float>      REAL                      = new DefaultDataType<>(FAMILY, SQLDataType.REAL, "real");
-    public static final DataType<Time>       TIME                      = new DefaultDataType<>(FAMILY, SQLDataType.TIME, "time(p)");
-    public static final DataType<Date>       DATE                      = new DefaultDataType<>(FAMILY, SQLDataType.DATE, "date");
-    public static final DataType<Timestamp>  TIMESTAMP                 = new DefaultDataType<>(FAMILY, SQLDataType.TIMESTAMP, "timestamp(p)");
-    public static final DataType<Timestamp>  DATETIME                  = new DefaultDataType<>(FAMILY, SQLDataType.TIMESTAMP, "datetime(p)");
+    public static final DataType<Byte>            TINYINT              = new DefaultDataType<>(FAMILY, SQLDataType.TINYINT, "tinyint");
+    public static final DataType<Short>           SMALLINT             = new DefaultDataType<>(FAMILY, SQLDataType.SMALLINT, "smallint");
+    public static final DataType<Short>           INT2                 = new DefaultDataType<>(FAMILY, SQLDataType.SMALLINT, "int2");
+    public static final DataType<Integer>         INT                  = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "int");
+    public static final DataType<Integer>         INTEGER              = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "integer");
+    public static final DataType<Integer>         MEDIUMINT            = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "mediumint");
+    public static final DataType<Integer>         INT4                 = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "int4");
+    public static final DataType<Integer>         SIGNED               = new DefaultDataType<>(FAMILY, SQLDataType.INTEGER, "signed");
+    public static final DataType<Boolean>         BOOLEAN              = new DefaultDataType<>(FAMILY, SQLDataType.BOOLEAN, "boolean");
+    public static final DataType<Boolean>         BOOL                 = new DefaultDataType<>(FAMILY, SQLDataType.BOOLEAN, "bool");
+    public static final DataType<Boolean>         BIT                  = new DefaultDataType<>(FAMILY, SQLDataType.BIT, "bit");
+    public static final DataType<Long>            BIGINT               = new DefaultDataType<>(FAMILY, SQLDataType.BIGINT, "bigint");
+    public static final DataType<Long>            INT8                 = new DefaultDataType<>(FAMILY, SQLDataType.BIGINT, "int8");
+    public static final DataType<BigDecimal>      DECIMAL              = new DefaultDataType<>(FAMILY, SQLDataType.DECIMAL, "decimal(p, s)");
+    public static final DataType<BigDecimal>      DEC                  = new DefaultDataType<>(FAMILY, SQLDataType.DECIMAL, "dec(p, s)");
+    public static final DataType<BigDecimal>      NUMBER               = new DefaultDataType<>(FAMILY, SQLDataType.NUMERIC, "number(p, s)");
+    public static final DataType<BigDecimal>      NUMERIC              = new DefaultDataType<>(FAMILY, SQLDataType.NUMERIC, "numeric(p, s)");
+    public static final DataType<Double>          DOUBLE               = new DefaultDataType<>(FAMILY, SQLDataType.DOUBLE, "double");
+    public static final DataType<Double>          FLOAT                = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float");
+    public static final DataType<Double>          FLOAT4               = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float4");
+    public static final DataType<Double>          FLOAT8               = new DefaultDataType<>(FAMILY, SQLDataType.FLOAT, "float8");
+    public static final DataType<Float>           REAL                 = new DefaultDataType<>(FAMILY, SQLDataType.REAL, "real");
+    public static final DataType<Time>            TIME                 = new DefaultDataType<>(FAMILY, SQLDataType.TIME, "time(p)");
+    public static final DataType<Date>            DATE                 = new DefaultDataType<>(FAMILY, SQLDataType.DATE, "date");
+    public static final DataType<Timestamp>       TIMESTAMP            = new DefaultDataType<>(FAMILY, SQLDataType.TIMESTAMP, "timestamp(p)");
+    public static final DataType<Timestamp>       DATETIME             = new DefaultDataType<>(FAMILY, SQLDataType.TIMESTAMP, "datetime(p)");
 
     public static final DataType<OffsetDateTime> TIMESTAMPWITHTIMEZONE = new DefaultDataType<>(FAMILY, SQLDataType.TIMESTAMPWITHTIMEZONE, "timestamp(p) with time zone");
-    public static final DataType<Instant>    INSTANT                   = new DefaultDataType<>(FAMILY, SQLDataType.INSTANT, "timestamp(p) with time zone");
+    public static final DataType<Instant>        INSTANT               = new DefaultDataType<>(FAMILY, SQLDataType.INSTANT, "timestamp(p) with time zone");
 
-    public static final DataType<byte[]>     BINARY                    = new DefaultDataType<>(FAMILY, SQLDataType.BINARY, "binary(l)");
-    public static final DataType<byte[]>     VARBINARY                 = new DefaultDataType<>(FAMILY, SQLDataType.VARBINARY, "varbinary(l)");
-    public static final DataType<byte[]>     LONGVARBINARY             = new DefaultDataType<>(FAMILY, SQLDataType.LONGVARBINARY, "longvarbinary(l)");
-    public static final DataType<byte[]>     BLOB                      = new DefaultDataType<>(FAMILY, SQLDataType.BLOB, "blob");
-    public static final DataType<Object>     OTHER                     = new DefaultDataType<>(FAMILY, SQLDataType.OTHER, "other");
-    public static final DataType<String>     VARCHAR                   = new DefaultDataType<>(FAMILY, SQLDataType.VARCHAR, "varchar(l)");
-    public static final DataType<String>     VARCHAR2                  = new DefaultDataType<>(FAMILY, SQLDataType.VARCHAR, "varchar2(l)");
-    public static final DataType<String>     CHAR                      = new DefaultDataType<>(FAMILY, SQLDataType.CHAR, "char(l)");
-    public static final DataType<String>     CHARACTER                 = new DefaultDataType<>(FAMILY, SQLDataType.CHAR, "character(l)");
-    public static final DataType<String>     LONGVARCHAR               = new DefaultDataType<>(FAMILY, SQLDataType.LONGVARCHAR, "longvarchar(l)");
-    public static final DataType<String>     CLOB                      = new DefaultDataType<>(FAMILY, SQLDataType.CLOB, "clob");
-    public static final DataType<String>     NVARCHAR                  = new DefaultDataType<>(FAMILY, SQLDataType.NVARCHAR, "nvarchar(l)");
-    public static final DataType<String>     NVARCHAR2                 = new DefaultDataType<>(FAMILY, SQLDataType.NVARCHAR, "nvarchar2(l)");
-    public static final DataType<String>     NCHAR                     = new DefaultDataType<>(FAMILY, SQLDataType.NCHAR, "nchar(l)");
-    public static final DataType<String>     NCLOB                     = new DefaultDataType<>(FAMILY, SQLDataType.NCLOB, "nclob");
-    public static final DataType<JSON>       JSON                      = new DefaultDataType<>(FAMILY, SQLDataType.JSON, "json");
-    public static final DataType<JSONB>      JSONB                     = new DefaultDataType<>(FAMILY, SQLDataType.JSONB, "json");
+    public static final DataType<byte[]>         BINARY                = new DefaultDataType<>(FAMILY, SQLDataType.BINARY, "binary(l)");
+    public static final DataType<byte[]>         VARBINARY             = new DefaultDataType<>(FAMILY, SQLDataType.VARBINARY, "varbinary(l)");
+    public static final DataType<byte[]>         LONGVARBINARY         = new DefaultDataType<>(FAMILY, SQLDataType.LONGVARBINARY, "longvarbinary(l)");
+    public static final DataType<byte[]>         BLOB                  = new DefaultDataType<>(FAMILY, SQLDataType.BLOB, "blob");
+    public static final DataType<Object>         OTHER                 = new DefaultDataType<>(FAMILY, SQLDataType.OTHER, "other");
+    public static final DataType<String>         VARCHAR               = new DefaultDataType<>(FAMILY, SQLDataType.VARCHAR, "varchar(l)");
+    public static final DataType<String>         VARCHAR2              = new DefaultDataType<>(FAMILY, SQLDataType.VARCHAR, "varchar2(l)");
+    public static final DataType<String>         CHAR                  = new DefaultDataType<>(FAMILY, SQLDataType.CHAR, "char(l)");
+    public static final DataType<String>         CHARACTER             = new DefaultDataType<>(FAMILY, SQLDataType.CHAR, "character(l)");
+    public static final DataType<String>         LONGVARCHAR           = new DefaultDataType<>(FAMILY, SQLDataType.LONGVARCHAR, "longvarchar(l)");
+    public static final DataType<String>         CLOB                  = new DefaultDataType<>(FAMILY, SQLDataType.CLOB, "clob");
+    public static final DataType<String>         NVARCHAR              = new DefaultDataType<>(FAMILY, SQLDataType.NVARCHAR, "nvarchar(l)");
+    public static final DataType<String>         NVARCHAR2             = new DefaultDataType<>(FAMILY, SQLDataType.NVARCHAR, "nvarchar2(l)");
+    public static final DataType<String>         NCHAR                 = new DefaultDataType<>(FAMILY, SQLDataType.NCHAR, "nchar(l)");
+    public static final DataType<String>         NCLOB                 = new DefaultDataType<>(FAMILY, SQLDataType.NCLOB, "nclob");
+    public static final DataType<JSON>           JSON                  = new DefaultDataType<>(FAMILY, SQLDataType.JSON, "json");
+    public static final DataType<JSONB>          JSONB                 = new DefaultDataType<>(FAMILY, SQLDataType.JSONB, "json");
+    public static final DataType<YearToMonth>    INTERVALYEARTOMONTH   = new DefaultDataType<>(FAMILY, SQLDataType.INTERVALYEARTOMONTH, "interval year to month");
+    public static final DataType<DayToSecond>    INTERVALDAYTOSECOND   = new DefaultDataType<>(FAMILY, SQLDataType.INTERVALDAYTOSECOND, "interval day to second", "interval day(9) to second");
 
     // -------------------------------------------------------------------------
     // Compatibility types for supported SQLDialect.H2, SQLDataTypes