From e545a4bde0794ffb11a89456c5c1591923b273e1 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 9 Mar 2018 12:55:19 +0100 Subject: [PATCH] [#7171] MERGE without INTO (possible in SQL Server) --- jOOQ/src/main/java/org/jooq/impl/ParserImpl.java | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java index 09f132feb5..d2246955bd 100644 --- a/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java +++ b/jOOQ/src/main/java/org/jooq/impl/ParserImpl.java @@ -1279,7 +1279,8 @@ final class ParserImpl implements Parser { } private static final Merge parseMerge(ParserContext ctx, WithImpl with) { - parseKeyword(ctx, "MERGE INTO"); + parseKeyword(ctx, "MERGE"); + parseKeywordIf(ctx, "INTO"); Table target = parseTableName(ctx); if (parseKeywordIf(ctx, "AS") || !peekKeyword(ctx, "USING"))