Merge pull request #525 from stumc/Issue#479EnhancedTest

Issue#479 Enhanced tests - removed comment about parameters not working for common table expressions - they appear to me to be working

h2/src/docsrc/help/help.csv

@@ -197,12 +197,10 @@ WITH [ RECURSIVE ] { name [( columnName [,...] )]
     AS ( select ) [,...] }
     select
 ","
-Can be used to create a recursive query. 
+Can be used to create a recursive or non-recursive query (common table expression). 
 For recursive queries the first select has to be a UNION.
-Non-recursive queries are also supported.
-One or more common table entries can be use referred to by name..
+One or more common table entries can be referred to by name.
 Column name declarations are now optional - the column names will be inferred from the named select queries.
-Positional parameters are not currently supported.
 ","
 WITH RECURSIVE t(n) AS (
         SELECT 1

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

@@ -30,6 +30,8 @@ public class TestGeneralCommonTableQueries extends TestBase {
         testSimple();
         testImpliedColumnNames();
         testChainedQuery();
+        testParameterizedQuery();
+        testNumberedParameterizedQuery();
     }
 
     private void testSimple() throws Exception {
@@ -126,6 +128,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
     	    +"        SELECT FIRST_COLUMN+1 AS FIRST_COLUMN FROM t1 "
     	    +") "
     	    +"SELECT sum(FIRST_COLUMN) FROM t2");
+        
         rs = prep.executeQuery();
         assertTrue(rs.next());
         assertEquals(2, rs.getInt(1));
@@ -134,4 +137,78 @@ public class TestGeneralCommonTableQueries extends TestBase {
         conn.close();
         deleteDb("commonTableExpressionQueries");
     }    
+
+    private void testParameterizedQuery() throws Exception {
+        deleteDb("commonTableExpressionQueries");
+        Connection conn = getConnection("commonTableExpressionQueries");
+        PreparedStatement prep;
+        ResultSet rs;
+      
+        prep = conn.prepareStatement("WITH t1 AS ("
+    	    +"     SELECT X, 'T1' FROM SYSTEM_RANGE(?,?)"
+    	    +"),"
+    	    +"t2 AS ("
+    	    +"     SELECT X, 'T2' FROM SYSTEM_RANGE(?,?)"
+    	    +") "
+    	    +"SELECT * FROM t1 UNION ALL SELECT * FROM t2 UNION ALL SELECT X, 'Q' FROM SYSTEM_RANGE(?,?)");
+        prep.setInt(1, 1); 
+        prep.setInt(2, 2); 
+        prep.setInt(3, 3); 
+        prep.setInt(4, 4); 
+        prep.setInt(5, 5); 
+        prep.setInt(6, 6); 
+        rs = prep.executeQuery();
+        
+        for(int n: new int[]{1,2,3,4,5,6} ){
+	        assertTrue(rs.next());
+	        assertEquals(n, rs.getInt(1));
+        }
+        assertFalse(rs.next());
+        
+        // call it twice
+        rs = prep.executeQuery();
+        
+        for(int n: new int[]{1,2,3,4,5,6} ){
+	        assertTrue(rs.next());
+	        assertEquals(n, rs.getInt(1));
+        }
+        assertFalse(rs.next());
+        
+        conn.close();
+        deleteDb("commonTableExpressionQueries");
+    }
+    
+    private void testNumberedParameterizedQuery() throws Exception {
+        deleteDb("commonTableExpressionQueries");
+        Connection conn = getConnection("commonTableExpressionQueries");
+        PreparedStatement prep;
+        ResultSet rs;
+      
+        prep = conn.prepareStatement("WITH t1 AS ("
+    	    +"     SELECT R.X, 'T1' FROM SYSTEM_RANGE(?1,?2) R"
+    	    +"),"
+    	    +"t2 AS ("
+    	    +"     SELECT R.X, 'T2' FROM SYSTEM_RANGE(?3,?4) R"
+    	    +") "
+    	    +"SELECT * FROM t1 UNION ALL SELECT * FROM t2 UNION ALL SELECT X, 'Q' FROM SYSTEM_RANGE(?5,?6)");
+        prep.setInt(1, 1); 
+        prep.setInt(2, 2); 
+        prep.setInt(3, 3); 
+        prep.setInt(4, 4); 
+        prep.setInt(5, 5); 
+        prep.setInt(6, 6); 
+        rs = prep.executeQuery();
+        
+        for(int n: new int[]{1,2,3,4,5,6} ){
+	        assertTrue(rs.next());
+	        assertEquals(n, rs.getInt(1));
+        }
+        assertEquals("X",rs.getMetaData().getColumnLabel(1));
+        assertEquals("'T1'",rs.getMetaData().getColumnLabel(2));
+
+        assertFalse(rs.next());
+
+        conn.close();
+        deleteDb("commonTableExpressionQueries");
+    }            
 }