[#7171] Support parsing ON CONFLICT DO (no constraint specification)

jOOQ · Mar 9, 2018 · 3dcb320 · 3dcb320
1 parent dd2e6ad
commit 3dcb320
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java
@@ -1203,13 +1203,15 @@ else if (parseKeywordIf(ctx, "CONFLICT")) {
                 if (parseKeywordIf(ctx, "ON CONSTRAINT")) {
                     doUpdate = onDuplicate.onConflictOnConstraint(parseName(ctx));
                 }
-                else {
-                    parse(ctx, '(');
+                else if (parseIf(ctx, '(')) {
                     doUpdate = onDuplicate.onConflict(parseFieldNames(ctx));
                     parse(ctx, ')');
                 }
-                parseKeyword(ctx, "DO");
+                else {
+                    doUpdate = onDuplicate.onConflict();
+                }
 
+                parseKeyword(ctx, "DO");
                 if (parseKeywordIf(ctx, "NOTHING")) {
                     returning = doUpdate.doNothing();
                 }