The query plan of queries with subqueries that contain nested joins was wrong.…

The query plan of queries with subqueries that contain nested joins was wrong. This could result in syntax exceptions for correct queries.

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

@@ -994,7 +994,7 @@ public class Select extends Query {
         } else {
             buff.resetCount();
             int i = 0;
-            for (TableFilter f : filters) {
+            for (TableFilter f : topFilters) {
                 buff.appendExceptFirst("\n");
                 buff.append(f.getPlanSQL(i++ > 0));
             }

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

@@ -633,16 +633,18 @@ public class TableFilter implements ColumnResolver {
                 buffNested.append("\n");
                 n = n.getJoin();
             } while (n != null);
-
             buff.append("(\n");
             buff.append(StringUtils.indent(buffNested.toString(), 4, false));
-            buff.append(") ON ");
-            if (joinCondition == null) {
-                // need to have a ON expression,
-                // otherwise the nesting is unclear
-                buff.append("1=1");
-            } else {
-                buff.append(StringUtils.unEnclose(joinCondition.getSQL()));
+            buff.append(")");
+            if (isJoin) {
+                buff.append(" ON ");
+                if (joinCondition == null) {
+                    // need to have a ON expression,
+                    // otherwise the nesting is unclear
+                    buff.append("1=1");
+                } else {
+                    buff.append(StringUtils.unEnclose(joinCondition.getSQL()));
+                }
             }
             return buff.toString();
         }