From 6e95ffce50122303d699d071b7fbb0b1a9630aa4 Mon Sep 17 00:00:00 2001
From: Lukas Eder <lukas.eder@gmail.com>
Date: Mon, 9 Mar 2020 11:45:34 +0100
Subject: [PATCH] [jOOQ/jOOQ#9928] Added parser support for <JSON constructor
 null clause>

---
 .../main/java/org/jooq/impl/ParserImpl.java   | 31 ++++++++++++++++---
 1 file changed, 27 insertions(+), 4 deletions(-)

diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
index 3c8a574792..11fc1a223a 100644
--- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
+++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -420,7 +420,9 @@ import org.jooq.InsertOnDuplicateStep;
 import org.jooq.InsertReturningStep;
 import org.jooq.InsertSetStep;
 import org.jooq.InsertValuesStepN;
+import org.jooq.JSON;
 import org.jooq.JSONEntry;
+import org.jooq.JSONObjectNullStep;
 import org.jooq.JoinType;
 import org.jooq.Keyword;
 // ...
@@ -502,6 +504,7 @@ import org.jooq.conf.RenderNameCase;
 import org.jooq.conf.RenderQuotedNames;
 import org.jooq.conf.Settings;
 import org.jooq.conf.SettingsTools;
+import org.jooq.impl.JSONObject.NullClause;
 import org.jooq.tools.StringUtils;
 import org.jooq.tools.reflect.Reflect;
 import org.jooq.types.DayToSecond;
@@ -6677,18 +6680,38 @@ final class ParserImpl implements Parser {
                 return DSL.jsonObject();
 
             List<JSONEntry<?>> result = new ArrayList<>();
-            do {
-                result.add(parseJSONEntry(ctx));
+            NullClause nullClause = parseJSONObjectNullClauseIf(ctx);
+
+            if (nullClause == null) {
+                do {
+                    result.add(parseJSONEntry(ctx));
+                }
+                while (parseIf(ctx, ','));
+
+                nullClause = parseJSONObjectNullClauseIf(ctx);
             }
-            while (parseIf(ctx, ','));
             parse(ctx, ')');
 
-            return DSL.jsonObject(result);
+            JSONObjectNullStep<JSON> o = DSL.jsonObject(result);
+            return nullClause == NullClause.NULL_ON_NULL
+                 ? o.nullOnNull()
+                 : nullClause == NullClause.ABSENT_ON_NULL
+                 ? o.absentOnNull()
+                 : o;
         }
 
         return null;
     }
 
+    private static final NullClause parseJSONObjectNullClauseIf(ParserContext ctx) {
+        if (parseKeywordIf(ctx, "NULL ON NULL"))
+            return NullClause.NULL_ON_NULL;
+        else if (parseKeywordIf(ctx, "ABSENT ON NULL"))
+            return NullClause.ABSENT_ON_NULL;
+        else
+            return null;
+    }
+
     private static final JSONEntry<?> parseJSONEntry(ParserContext ctx) {
         boolean valueRequired = parseKeywordIf(ctx, "KEY");