Merge pull request #550 from stumc/Issue#549

Issue#549 Removed UNION ALL requirements for CTE

h2/src/main/org/h2/index/ViewIndex.java

@@ -196,13 +196,9 @@ public class ViewIndex extends BaseIndex implements SpatialIndex {
         }
         if (!query.isUnion()) {
             throw DbException.get(ErrorCode.SYNTAX_ERROR_2,
-                    "recursive queries without UNION ALL");
+                    "recursive queries without UNION");
         }
         SelectUnion union = (SelectUnion) query;
-        if (union.getUnionType() != SelectUnion.UNION_ALL) {
-            throw DbException.get(ErrorCode.SYNTAX_ERROR_2,
-                    "recursive queries without UNION ALL");
-        }
         Query left = union.getLeft();
         // to ensure the last result is not closed
         left.disableCache();

h2/src/test/org/h2/test/db/TestRecursiveQueries.java

@@ -29,7 +29,8 @@ public class TestRecursiveQueries extends TestBase {
     @Override
     public void test() throws Exception {
         testWrongLinkLargeResult();
-        testSimple();
+        testSimpleUnionAll();
+        testSimpleUnion();
     }
 
     private void testWrongLinkLargeResult() throws Exception {
@@ -60,7 +61,7 @@ public class TestRecursiveQueries extends TestBase {
         deleteDb("recursiveQueries");
     }
 
-    private void testSimple() throws Exception {
+    private void testSimpleUnionAll() throws Exception {
         deleteDb("recursiveQueries");
         Connection conn = getConnection("recursiveQueries");
         Statement stat;
@@ -156,4 +157,26 @@ public class TestRecursiveQueries extends TestBase {
         deleteDb("recursiveQueries");
     }
     
+    private void testSimpleUnion() throws Exception {
+        deleteDb("recursiveQueries");
+        Connection conn = getConnection("recursiveQueries");
+        Statement stat;
+        ResultSet rs;
+
+        stat = conn.createStatement();
+        rs = stat.executeQuery("with recursive t(n) as " +
+                "(select 1 union select n+1 from t where n<3) " +
+                "select * from t");
+        assertTrue(rs.next());
+        assertEquals(1, rs.getInt(1));
+        assertTrue(rs.next());
+        assertEquals(2, rs.getInt(1));
+        assertTrue(rs.next());
+        assertEquals(3, rs.getInt(1));
+        assertFalse(rs.next());
+        
+        conn.close();
+        deleteDb("recursiveQueries");
+   }
+
 }