Issue#479 Changed asserts and refactored long parser method

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

@@ -4858,9 +4858,18 @@ public class Parser {
     }
 
     private Query parseWith() {
+    	List<TableView> viewsCreated = new ArrayList<TableView>();
         readIf("RECURSIVE");        
-        
         do{
+        	viewsCreated.add(parseSingleCommonTableExression());
+        } while(readIf(","));
+        
+        Query q = parseSelectUnion();
+        q.setPrepareAlways(true);
+        return q;
+    }
+
+	private TableView parseSingleCommonTableExression() {
 		String tempViewName = readIdentifierWithSchema();
 		Schema schema = getSchema();
 		Table recursiveTable;
@@ -4872,6 +4881,7 @@ public class Parser {
 		if(readIf("(")){
 		    cols = parseColumnList();
 		    for (String c : cols) {
+		    	// we dont really know the type of the column, so string will have to do
 		        columns.add(new Column(c, Value.STRING));
 		    }
 		}
@@ -4888,6 +4898,9 @@ public class Parser {
 		    }
 		    session.removeLocalTempTable(old);
 		}
+		// this table is created as a work around because recursive 
+		// table expressions need to reference something that look like themselves
+		// to work (its removed after creation in this method)
 		CreateTableData data = new CreateTableData();
 		data.id = database.allocateObjectId();
 		data.columns = columns;
@@ -4925,11 +4938,7 @@ public class Parser {
 		view.setTemporary(true);
 		session.addLocalTempTable(view);
 		view.setOnCommitDrop(true);
-        } while(readIf(","));
-        
-        Query q = parseSelectUnion();
-        q.setPrepareAlways(true);
-        return q;
+		return view;
 	}
 
     private CreateView parseCreateView(boolean force, boolean orReplace) {

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

@@ -121,7 +121,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
         assertTrue(rs.next());
         assertEquals(3, rs.getInt("FIRST_COL"));
         assertFalse(rs.next());
-        assertEquals("rsMeta0: columns=1",rs.getMetaData().toString());
+        assertEquals(rs.getMetaData().getColumnCount(),1);
         assertEquals("FIRST_COL",rs.getMetaData().getColumnLabel(1));
         
         conn.close();