Put gurad on testing memory db with CTEs, added lazy never for persistent CTEs

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

@@ -110,7 +110,7 @@ public class TableView extends Table {
         initColumnsAndTables(session, literalsChecked);
     }
 
-    private static Query compileViewQuery(Session session, String sql, boolean literalsChecked, String viewName) {
+    private Query compileViewQuery(Session session, String sql, boolean literalsChecked, String viewName) {
         Prepared p;
         session.setParsingView(true,viewName);
         try {
@@ -121,7 +121,11 @@ public class TableView extends Table {
         if (!(p instanceof Query)) {
             throw DbException.getSyntaxError(sql, 0);
         }
-        return (Query) p;
+        Query q = (Query) p;
+        if(isTableExpression){
+            q.setNeverLazy(true);
+        }
+        return q;
     }
 
     /**

h2/src/test/org/h2/test/TestAll.java

@@ -761,7 +761,10 @@ kill -9 `jps -l | grep "org.h2.test." | cut -d " " -f 1`
         addTest(new TestOutOfMemory());
         addTest(new TestReadOnly());
         addTest(new TestRecursiveQueries());
-        addTest(new TestGeneralCommonTableQueries());
+        if(!memory){
+            // requires persistent store for reconnection tests
+            addTest(new TestGeneralCommonTableQueries());
+        }
         addTest(new TestRights());
         addTest(new TestRunscript());
         addTest(new TestSQLInjection());

h2/src/test/org/h2/test/TestBase.java

@@ -124,7 +124,6 @@ public abstract class TestBase {
      *
      * @param seed the random seed value
      */
-    @SuppressWarnings("unused")
     public void testCase(int seed) throws Exception {
         // do nothing
     }

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

@@ -516,7 +516,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
                +"GROUP BY a)                              \n"
                +"SELECT                                   \n"
                +"A.val,                                   \n"
-               +"sum(SELECT X FROM BB WHERE BB.a IS A.val)\n"//AS SUM_X
+               +"sum(SELECT X FROM BB WHERE BB.a IS A.val)\n"
                +"FROM A                                   \n"
                +"GROUP BY A.val";
 
@@ -622,7 +622,7 @@ public class TestGeneralCommonTableQueries extends TestBase {
 
         
         for(int queryRunTries=1;queryRunTries<=maxRetries;queryRunTries++){
-            System.out.println("==================================== Iteration #"+queryRunTries);
+            //System.out.println("==================================== Iteration #"+queryRunTries);
 
             Statement stat = conn.createStatement();
             stat.execute(SETUP_SQL);
@@ -630,12 +630,12 @@ public class TestGeneralCommonTableQueries extends TestBase {
 
             // close and re-open connection for one iteration to make sure the query work between connections
             if(queryRunTries==closeAndReopenDatabaseConnectionOnIteration){
-                System.out.println("Reconnecting to database on iteration#"+queryRunTries+" of "+maxRetries);
+                //System.out.println("Reconnecting to database on iteration#"+queryRunTries+" of "+maxRetries);
                 conn.close();
                 
                 conn = getConnection("commonTableExpressionQueries");
             }
-            System.out.println("=========== test with query");
+            //System.out.println("=========== test with query");
             prep = conn.prepareStatement(WITH_QUERY);
 
             rs = prep.executeQuery();