Clear CTE views on parsing or preparation error

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

@@ -6,6 +6,7 @@
 package org.h2.command;
 
 import java.util.ArrayList;
+import java.util.List;
 import org.h2.api.DatabaseEventListener;
 import org.h2.command.dml.Explain;
 import org.h2.command.dml.Query;
@@ -27,6 +28,35 @@ public class CommandContainer extends Command {
     private boolean readOnlyKnown;
     private boolean readOnly;
 
+    /**
+     * Clears CTE views for a specified statement.
+     *
+     * @param session the session
+     * @param prepared prepared statement
+     */
+    static void clearCTE(Session session, Prepared prepared) {
+        List<TableView> cteCleanups = prepared.getCteCleanups();
+        if (cteCleanups != null) {
+            clearCTE(session, cteCleanups);
+        }
+    }
+
+    /**
+     * Clears CTE views.
+     *
+     * @param session the session
+     * @param views list of view
+     */
+    static void clearCTE(Session session, List<TableView> views) {
+        for (TableView view : views) {
+            // check if view was previously deleted as their name is set to
+            // null
+            if (view.getName() != null) {
+                session.removeLocalTempTable(view);
+            }
+        }
+    }
+
     CommandContainer(Session session, String sql, Prepared prepared) {
         super(session, sql);
         prepared.setCommand(this);
@@ -123,15 +153,7 @@ public class CommandContainer extends Command {
         super.stop();
         // Clean up after the command was run in the session.
         // Must restart query (and dependency construction) to reuse.
-        if (prepared.getCteCleanups() != null) {
-            for (TableView view : prepared.getCteCleanups()) {
-                // check if view was previously deleted as their name is set to
-                // null
-                if (view.getName() != null) {
-                    session.removeLocalTempTable(view);
-                }
-            }
-        }
+        clearCTE(session, prepared);
     }
 
     @Override

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

@@ -672,7 +672,12 @@ public class Parser {
             if (!hasMore && currentTokenType != END) {
                 throw getSyntaxError();
             }
-            p.prepare();
+            try {
+                p.prepare();
+            } catch (Throwable t) {
+                CommandContainer.clearCTE(session, p);
+                throw t;
+            }
             Command c = new CommandContainer(session, sql, p);
             if (hasMore) {
                 String remaining = originalSQL.substring(parseIndex);
@@ -6128,6 +6133,15 @@ public class Parser {
 
     private Prepared parseWith() {
         List<TableView> viewsCreated = new ArrayList<>();
+        try {
+            return parseWith1(viewsCreated);
+        } catch (Throwable t) {
+            CommandContainer.clearCTE(session, viewsCreated);
+            throw t;
+        }
+    }
+
+    private Prepared parseWith1(List<TableView> viewsCreated) {
         readIf("RECURSIVE");
 
         // This WITH statement is not a temporary view - it is part of a persistent view

h2/src/test/org/h2/test/scripts/dml/with.sql

@@ -146,5 +146,11 @@ WITH CTE_TEST AS (TABLE TEST) ((TABLE CTE_TEST));
 > 1 2
 > rows: 1
 
+WITH CTE_TEST AS (TABLE TEST) ((SELECT A, B FROM CTE_TEST2));
+> exception TABLE_OR_VIEW_NOT_FOUND_1
+
+WITH CTE_TEST AS (TABLE TEST) ((SELECT A, B, C FROM CTE_TEST));
+> exception COLUMN_NOT_FOUND_1
+
 DROP TABLE TEST;
 > ok