From bfd146874fde73a4bba265c80702ec14e2bbca41 Mon Sep 17 00:00:00 2001
From: lukaseder <lukas.eder@gmail.com>
Date: Fri, 27 Apr 2018 17:31:42 +0200
Subject: [PATCH] [#7171] [#7446] Support parsing ISO_8601 interval literals

---
 .../resources/org/jooq/web/grammar-3.11.txt   |  4 ++++
 .../main/java/org/jooq/impl/ParserImpl.java   |  9 +++++----
 .../main/java/org/jooq/types/DayToSecond.java | 12 +++++++++++-
 .../main/java/org/jooq/types/YearToMonth.java | 19 ++++++++++++++++---
 4 files changed, 36 insertions(+), 8 deletions(-)

diff --git a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
index 4e9ba77ac0..fe31a277c4 100644
--- a/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
+++ b/jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt
@@ -639,6 +639,7 @@ term =
 | 'HOUR' '(' field ')'
 | 'IFNULL' '(' field ',' field ')'
 | 'INSTR' '(' field ',' field ')'
+| intervalLiteral
 | 'IIF' '(' condition ',' field ',' field ')'
 | 'ISNULL' '(' field ',' field ')'
 | ( 'LOWER' | 'LCASE' ) '(' field ')'
@@ -897,6 +898,9 @@ timeLiteral = 'TIME' stringLiteral
 timestampLiteral = 'TIMESTAMP' stringLiteral
 ;
 
+intervalLiteral = 'INTERVAL' stringLiteral
+;
+
 signedInteger = todo
 ;
 
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index b78f247c88..89c7c560ca 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -5089,15 +5089,16 @@ final class ParserImpl implements Parser {
 
     private static final Interval parseIntervalLiteral(ParserContext ctx) {
         String string = parseStringLiteral(ctx);
-        YearToMonth ym = YearToMonth.valueOf(string);
-
-        if (ym != null)
-            return ym;
 
         DayToSecond ds = DayToSecond.valueOf(string);
         if (ds != null)
             return ds;
 
+        YearToMonth ym = YearToMonth.valueOf(string);
+
+        if (ym != null)
+            return ym;
+
         throw ctx.exception("Illegal interval literal");
     }
 
diff --git a/jOOQ/src/main/java/org/jooq/types/DayToSecond.java b/jOOQ/src/main/java/org/jooq/types/DayToSecond.java
index e5ed27a337..7e1a97cc50 100644
--- a/jOOQ/src/main/java/org/jooq/types/DayToSecond.java
+++ b/jOOQ/src/main/java/org/jooq/types/DayToSecond.java
@@ -38,6 +38,7 @@
 package org.jooq.types;
 
 import java.time.Duration;
+import java.time.format.DateTimeParseException;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
@@ -85,7 +86,7 @@ public final class DayToSecond extends Number implements Interval, Comparable<Da
      * Generated UID
      */
     private static final long    serialVersionUID = -3853596481984643811L;
-    private static final Pattern PATTERN          = Pattern.compile("(\\+|-)?(?:(\\d+) )?(\\d+):(\\d+):(\\d+)(?:\\.(\\d+))?");
+    private static final Pattern PATTERN          = Pattern.compile("([+-])?(?:(\\d+) )?(\\d+):(\\d+):(\\d+)(?:\\.(\\d+))?");
 
     private final boolean        negative;
     private final int            days;
@@ -186,6 +187,15 @@ public final class DayToSecond extends Number implements Interval, Comparable<Da
 
                     return new DayToSecond(days, hours, minutes, seconds, nano, negative);
                 }
+
+
+                else {
+                    try {
+                        return DayToSecond.valueOf(Duration.parse(string));
+                    }
+                    catch (DateTimeParseException ignore) {}
+                }
+
             }
         }
 
diff --git a/jOOQ/src/main/java/org/jooq/types/YearToMonth.java b/jOOQ/src/main/java/org/jooq/types/YearToMonth.java
index ea4f6e215c..e751c50c27 100644
--- a/jOOQ/src/main/java/org/jooq/types/YearToMonth.java
+++ b/jOOQ/src/main/java/org/jooq/types/YearToMonth.java
@@ -79,7 +79,8 @@ public final class YearToMonth extends Number implements Interval, Comparable<Ye
      * Generated UID
      */
     private static final long    serialVersionUID = 1308553645456594273L;
-    private static final Pattern PATTERN          = Pattern.compile("(\\+|-)?(\\d+)-(\\d+)");
+    private static final Pattern PATTERN_SQL      = Pattern.compile("([+-])?(\\d+)-(\\d+)");
+    private static final Pattern PATTERN_ISO      = Pattern.compile("([+-])?P(?:([+-]?\\d+)Y)?(?:([+-]?\\d+)M)?", Pattern.CASE_INSENSITIVE);
 
     private final boolean        negative;
     private final int            years;
@@ -123,15 +124,27 @@ public final class YearToMonth extends Number implements Interval, Comparable<Ye
      */
     public static YearToMonth valueOf(String string) {
         if (string != null) {
-            Matcher matcher = PATTERN.matcher(string);
+            Matcher matcher;
 
-            if (matcher.find()) {
+            if ((matcher = PATTERN_SQL.matcher(string)).find()) {
                 boolean negative = "-".equals(matcher.group(1));
                 int years = Integer.parseInt(matcher.group(2));
                 int months = Integer.parseInt(matcher.group(3));
 
                 return new YearToMonth(years, months, negative);
             }
+
+            if ((matcher = PATTERN_ISO.matcher(string)).find()) {
+                boolean negative = "-".equals(matcher.group(1));
+
+                String group2 = matcher.group(2);
+                String group3 = matcher.group(3);
+
+                int years = group2 == null ? 0 : Integer.parseInt(group2);
+                int months = group3 == null ? 0 : Integer.parseInt(group3);
+
+                return new YearToMonth(years, months, negative);
+            }
         }
 
         return null;