Merge pull request #905 from katzyn/join

Move some JOIN tests from testScript.sql to own file

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

@@ -2490,8 +2490,7 @@ public class Parser {
                                 int idx = filters.indexOf(rightFilter);
                                 if (idx >= 0) {
                                     filters.remove(idx);
-                                    leftFilter.addJoin(rightFilter, true,
-                                            false, r);
+                                    leftFilter.addJoin(rightFilter, true, false, r);
                                 } else {
                                     rightFilter.mapAndAddFilter(r);
                                 }

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

@@ -640,8 +640,7 @@ public class TableFilter implements ColumnResolver {
      * @param nested if this is a nested join
      * @param on the join condition
      */
-    public void addJoin(TableFilter filter, boolean outer, boolean nested,
-            final Expression on) {
+    public void addJoin(TableFilter filter, boolean outer, boolean nested, Expression on) {
         if (on != null) {
             on.mapColumns(this, 0);
             TableFilterVisitor visitor = new MapColumnsVisitor(on);
@@ -671,7 +670,7 @@ public class TableFilter implements ColumnResolver {
                     filter.mapAndAddFilter(on);
                 }
             } else {
-                join.addJoin(filter, outer, nested, on);
+                join.addJoin(filter, outer, false, on);
             }
         }
     }

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

@@ -82,6 +82,7 @@ public class TestScript extends TestBase {
         reconnectOften = !config.memory && config.big;
 
         testScript("testScript.sql");
+        testScript("joins.sql");
         testScript("altertable-index-reuse.sql");
         testScript("query-optimisations.sql");
         testScript("commands-dml-script.sql");