Restore currentPrepared in parseSelectSimple()

h2/src/docsrc/html/changelog.html

@@ -21,6 +21,10 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
+<li>Issue #1573: DELETE FROM w/ ROWNUM and subquery
+</li>
+<li>PR #1571: Optimizing ConditionAndOr queries
+</li>
 <li>Issue #1565: SOME / ANY conflict
 </li>
 <li>PR #1564: Refactor Expression implementations

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

@@ -2620,6 +2620,7 @@ public class Parser {
         Select command = new Select(session);
         int start = lastParseIndex;
         Select oldSelect = currentSelect;
+        Prepared oldPrepared = currentPrepared;
         currentSelect = command;
         currentPrepared = command;
         if (fromFirst) {
@@ -2676,6 +2677,7 @@ public class Parser {
         }
         command.setParameterList(parameters);
         currentSelect = oldSelect;
+        currentPrepared = oldPrepared;
         setSQL(command, "SELECT", start);
         return command;
     }

h2/src/test/org/h2/test/scripts/TestScript.java

@@ -154,7 +154,7 @@ public class TestScript extends TestDb {
                 "dropDomain", "dropIndex", "dropSchema", "truncateTable" }) {
             testScript("ddl/" + s + ".sql");
         }
-        for (String s : new String[] { "error_reporting", "insertIgnore", "merge", "mergeUsing", "replace",
+        for (String s : new String[] { "delete", "error_reporting", "insertIgnore", "merge", "mergeUsing", "replace",
                 "script", "select", "show", "with" }) {
             testScript("dml/" + s + ".sql");
         }