From 3dcb32098e8c18b2689188ac24b05aaa1bf15227 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 9 Mar 2018 12:47:46 +0100 Subject: [PATCH] [#7171] Support parsing ON CONFLICT DO (no constraint specification) --- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 98019424a0..09f132feb5 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -1203,13 +1203,15 @@ final class ParserImpl implements Parser { 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(); }