From e4fdaaa642d52877a07d5659bcfbbb01880d13e9 Mon Sep 17 00:00:00 2001 From: lukaseder Date: Fri, 9 Mar 2018 12:57:46 +0100 Subject: [PATCH] [#7171] MERGE without INTO (possible in SQL Server --- jOOQ-manual/src/main/resources/org/jooq/web/grammar-3.11.txt | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 03a8d79738..6a083f1882 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 @@ -238,7 +238,7 @@ setClause = fieldName '=' field deleteStatement = [ with ] 'DELETE' [ 'FROM' ] tableName [ 'WHERE' condition ] [ 'RETURNING' ( '*' | fields ) ] ; -mergeStatement = [ with ] 'MERGE INTO' tableName [ [ 'AS' ] identifier ] +mergeStatement = [ with ] 'MERGE' [ 'INTO' ] tableName [ [ 'AS' ] identifier ] 'USING' '(' select ')' [ [ 'AS' ] identifier ] 'ON' condition break {