Merge pull request #596 from stumc/Issue#591

Issue#591 Generated SQL from WITH-CTEs does not include a table ident…

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

@@ -1291,6 +1291,10 @@ public class Parser {
                 }
             }
         }
+        // inherit alias for temporary views (usually CTE's) from table name
+        if(table.isView() && table.isTemporary() && alias==null){
+            alias = table.getName();
+        }
         return new TableFilter(session, table, alias, rightsChecked,
                 currentSelect, orderInFrom++, indexHints);
     }

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

@@ -40,6 +40,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
         testDelete();
         testMerge();
         testCreateTable();
+        testNestedSQL();
     }
 
     private void testSimpleSelect() throws Exception {
@@ -388,4 +389,53 @@ public class TestGeneralCommonTableQueries extends TestBase {
         conn.close();
         deleteDb("commonTableExpressionQueries");
     }
+    
+    private void testNestedSQL() throws Exception {
+        deleteDb("commonTableExpressionQueries");
+        Connection conn = getConnection("commonTableExpressionQueries");
+        PreparedStatement prep;
+        ResultSet rs;
+
+        prep = conn.prepareStatement(
+            "WITH T1 AS (                        "+
+            "        SELECT *                    "+
+            "        FROM TABLE (                "+
+            "            K VARCHAR = ('a', 'b'), "+
+            "            V INTEGER = (1, 2)      "+
+            "    )                               "+
+            "),                                  "+
+            "                                    "+
+            "                                    "+
+            "T2 AS (                             "+
+            "        SELECT *                    "+
+            "        FROM TABLE (                "+
+            "            K VARCHAR = ('a', 'b'), "+
+            "            V INTEGER = (3, 4)      "+
+            "    )                               "+
+            "),                                  "+
+            "                                    "+
+            "                                    "+
+            "JOIN_CTE AS (                       "+
+            "    SELECT T1.*                     "+
+            "                                    "+
+            "    FROM                            "+
+            "        T1                          "+
+            "        JOIN T2 ON (                "+
+            "            T1.K = T2.K             "+
+            "        )                           "+
+            ")                                   "+
+            "                                    "+
+            "SELECT * FROM JOIN_CTE");
+
+        rs = prep.executeQuery();
+
+        for (String keyLetter : new String[] { "a", "b" }) {
+            assertTrue(rs.next());
+            assertContains("ab",rs.getString(1));
+            assertEquals(rs.getString(1),keyLetter);
+            assertTrue(rs.getInt(2)!=0);
+        }
+        conn.close();
+        deleteDb("commonTableExpressionQueries");
+    }    
 }
\ No newline at end of file

h2/src/test/org/h2/test/testScript.sql

@@ -10333,8 +10333,8 @@ explain with recursive r(n) as (
 )
 select n from r;
 > PLAN
-> -----------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
-> WITH RECURSIVE R(N) AS ( (SELECT 1 FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */) UNION ALL (SELECT (N + 1) FROM PUBLIC.R /* PUBLIC.R.tableScan */ WHERE N < 3) ) SELECT N FROM R /* null */
+> -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------
+> WITH RECURSIVE R(N) AS ( (SELECT 1 FROM SYSTEM_RANGE(1, 1) /* PUBLIC.RANGE_INDEX */) UNION ALL (SELECT (N + 1) FROM PUBLIC.R /* PUBLIC.R.tableScan */ WHERE N < 3) ) SELECT N FROM R R /* null */
 > rows: 1
 
 select sum(n) from (