Merge pull request #1279 from katzyn/dml

Allow parentheses around final action in WITH

h2/src/main/org/h2/command/Parser.java

@@ -5508,6 +5508,10 @@ public class Parser {
         // used in setCteCleanups.
         Collections.reverse(viewsCreated);
 
+        int parentheses = 0;
+        while (readIf(OPEN_PAREN)) {
+            parentheses++;
+        }
         if (isToken(SELECT)) {
             Query query = parseSelectUnion();
             query.setPrepareAlways(true);
@@ -5537,6 +5541,9 @@ public class Parser {
             throw DbException.get(ErrorCode.SYNTAX_ERROR_1,
                     WITH_STATEMENT_SUPPORTS_LIMITED_SUB_STATEMENTS);
         }
+        for (; parentheses > 0; parentheses--) {
+            read(CLOSE_PAREN);
+        }
 
         // Clean up temporary views starting with last to first (in case of
         // dependencies) - but only if they are not persistent.

h2/src/test/org/h2/test/scripts/dml/with.sql

@@ -82,3 +82,21 @@ SELECT * FROM SCH.R2;
 > 2
 > 3
 > rows: 3
+
+WITH CTE_TEST AS (SELECT 1, 2) SELECT * FROM CTE_TEST;
+> 1 2
+> - -
+> 1 2
+> rows: 1
+
+WITH CTE_TEST AS (SELECT 1, 2) (SELECT * FROM CTE_TEST);
+> 1 2
+> - -
+> 1 2
+> rows: 1
+
+WITH CTE_TEST AS (SELECT 1, 2) ((SELECT * FROM CTE_TEST));
+> 1 2
+> - -
+> 1 2
+> rows: 1
\ No newline at end of file