Issue#479 Made column names optional

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

@@ -18,6 +18,7 @@ import java.util.Comparator;
 import java.util.HashSet;
 import java.util.LinkedHashSet;
 import java.util.List;
+import java.util.stream.Collectors;
 
 import org.h2.api.ErrorCode;
 import org.h2.api.Trigger;
@@ -4906,7 +4907,10 @@ public class Parser {
 	            querySQL = StringUtils.cache(withQuery.getPlanSQL());
 	            ArrayList<Expression> withExpressions = withQuery.getExpressions();
 	            for (int i = 0; i < withExpressions.size(); ++i) {
-	            	String columnName = cols !=null ? cols[i] : withExpressions.get(i).getColumnName();
+	            	System.out.println("columnName="+withExpressions.get(i).getColumnName());
+	            	System.out.println("alias="+withExpressions.get(i).getAlias());
+	            	System.out.println("nonAliasExpression="+withExpressions.get(i).getNonAliasExpression());
+	            	String columnName = cols != null ? cols[i] : withExpressions.get(i).getColumnName();
 	            	columnTemplateList.add(new Column(columnName, withExpressions.get(i).getType()));
 	            }
 	        } finally {
@@ -4915,7 +4919,7 @@ public class Parser {
 	        int id = database.allocateObjectId();
 	        boolean isRecursive = RecursiveQuery.isRecursive(tempViewName,querySQL);
 	        System.out.println("tempViewName=>"+tempViewName+"<");
-	        System.out.println("columnTemplateList="+columnTemplateList);
+	        System.out.println("columnTemplateList="+columnTemplateList.stream().map(Column::toStringWithType).collect(Collectors.toList()));
 	        System.out.println("isRecursive="+isRecursive);
 	        System.out.println("querySQL="+querySQL);
 	        TableView view = new TableView(schema, id, tempViewName, querySQL,

h2/src/main/org/h2/command/dml/RecursiveQuery.java

@@ -7,21 +7,15 @@ public class RecursiveQuery {
 	
 	// A query is recursive if it references it's own name in its definition
 	public static boolean isRecursive(String tempViewName, String querySQL) {
-		// ?i is case insensitive
-		// ?m is multi-line search
-		// ?d is Unix line endings
-		String pattern = "(?i)(?m)(?d).*\\b("+tempViewName+")\\b";
-		System.out.println("pattern="+pattern);
-		boolean stringContains = querySQL.contains(tempViewName);
-		System.out.println("stringContains="+stringContains);
 		boolean foundAny = RecursiveQuery.foundAny(tempViewName,querySQL);
 		System.out.println("foundAny="+foundAny);
-		boolean patternMatch = Pattern.matches(pattern,querySQL);
-		System.out.println("patternMatch="+patternMatch);
-		return patternMatch||stringContains|| foundAny;
+		return foundAny;
 	}
 
 	private static boolean foundAny(String tempViewName, String querySQL){
+		// ?i is case insensitive
+		// ?m is multi-line search
+		// ?d is Unix line endings
 		Pattern p = Pattern.compile("(?i)(?m)(?d)\\b("+tempViewName+")\\b");
 		Matcher m = p.matcher(querySQL);
 		while (m.find()) {

h2/src/main/org/h2/table/Column.java

@@ -738,6 +738,9 @@ public class Column {
     public String toString() {
         return name;
     }
+    public String toStringWithType() {
+        return DataType.getTypeClassName(type)+":"+name;
+    }
 
     /**
      * Check whether the new column is of the same type and not more restricted

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

@@ -32,6 +32,11 @@ public class TestGeneralCommonTableQueries extends TestBase {
             ",t3(n) as (select 4 as first) " +
             "select * from t1 union all select * from t2 union all select * from t3 where n<>?";
 
+    private static final String PARAMETERIZED_THREE_COMMON_QUERY_IMPLIED_COLUMN_NAMES = "with " +
+            "t1 as (select 2 as first_col) " +
+            ",t2 as (select first_col+1 from t1) " +
+            ",t3 as (select 4 as first_col) " +
+            "select * from t1 union all select * from t2 union all select * from t3 where first_col<>?";
 	/**
      * Run just this test.
      *
@@ -45,6 +50,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
     @Override
     public void test() throws Exception {
         testSimple();
+        testImpliedColumnNames();
     }
 
     private void testSimple() throws Exception {
@@ -92,4 +98,24 @@ public class TestGeneralCommonTableQueries extends TestBase {
         deleteDb("commonTableExpressionQueries");
     }
 
+    private void testImpliedColumnNames() throws Exception {
+        deleteDb("commonTableExpressionQueries");
+        Connection conn = getConnection("commonTableExpressionQueries");
+        PreparedStatement prep;
+        ResultSet rs;
+      
+        prep = conn.prepareStatement(PARAMETERIZED_THREE_COMMON_QUERY_IMPLIED_COLUMN_NAMES);
+        prep.setInt(1, 4); // omit 4 line (last)
+        rs = prep.executeQuery();
+        assertTrue(rs.next());
+        assertEquals(2, rs.getInt(1));
+        assertTrue(rs.next());
+        assertEquals(3, rs.getInt("FIRST_COL"));
+        assertFalse(rs.next());
+        assertEquals("rsMeta0: columns=1",rs.getMetaData().toString());
+        assertEquals("FIRST_COL",rs.getMetaData().getColumnLabel(1));
+        
+        conn.close();
+        deleteDb("commonTableExpressionQueries");
+    }
 }