More tests

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

@@ -86,6 +86,7 @@ import org.h2.test.server.TestPgServer;
 import org.h2.test.server.TestWeb;
 import org.h2.test.synth.TestBtreeIndex;
 import org.h2.test.synth.TestCrashAPI;
+import org.h2.test.synth.TestFuzzOptimizations;
 import org.h2.test.synth.TestHaltApp;
 import org.h2.test.synth.TestJoin;
 import org.h2.test.synth.TestKill;
@@ -570,6 +571,7 @@ http://www.w3schools.com/sql/
 
         // synth
         new TestCrashAPI().runTest(this);
+        new TestFuzzOptimizations().runTest(this);
         new TestRandomSQL().runTest(this);
         new TestKillRestart().runTest(this);
         new TestKillRestartMulti().runTest(this);

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

@@ -12,6 +12,7 @@ import java.sql.DriverManager;
 import java.sql.PreparedStatement;
 import java.sql.ResultSet;
 import java.sql.ResultSetMetaData;
+import java.sql.SQLException;
 import java.sql.Statement;
 import java.util.ArrayList;
 import java.util.HashMap;
@@ -98,16 +99,8 @@ public class Db {
         }
     }
     
-    /**
-     * Execute a SQL statement.
-     * 
-     * @param sql the SQL statement
-     * @return a list of maps
-     */
-    public List query(String sql) {
-        try {
+    static List query(ResultSet rs) throws SQLException {
         List list = new ArrayList();
-            ResultSet rs = stat.executeQuery(sql);
         ResultSetMetaData meta = rs.getMetaData();
         int columnCount = meta.getColumnCount();
         while (rs.next()) {
@@ -118,6 +111,17 @@ public class Db {
             list.add(map);
         }
         return list;
+    }
+    
+    /**
+     * Execute a SQL statement.
+     * 
+     * @param sql the SQL statement
+     * @return a list of maps
+     */
+    public List query(String sql) {
+        try {
+            return query(stat.executeQuery(sql));
         } catch (Exception e) {
             throw convert(e);
         }
@@ -211,6 +215,17 @@ public class Db {
                 throw convert(e);
             }
         }
+        
+        /**
+         * Execute the prepared query.
+         */        
+        public List query() {
+            try {
+                return Db.query(prep.executeQuery());
+            } catch (Exception e) {
+                throw convert(e);
+            }
+        }
     }
 
     /**

h2/src/test/org/h2/test/synth/TestOptimizations.java → h2/src/test/org/h2/test/synth/TestFuzzOptimizations.java

@@ -11,6 +11,7 @@ import java.sql.SQLException;
 import java.util.List;
 import java.util.Random;
 
+import org.h2.constant.SysProperties;
 import org.h2.test.TestBase;
 import org.h2.test.db.Db;
 import org.h2.test.db.Db.Prepared;
@@ -19,7 +20,7 @@ import org.h2.test.db.Db.Prepared;
  * This test executes random SQL statements to test if optimizations are working
  * correctly.
  */
-public class TestOptimizations extends TestBase {
+public class TestFuzzOptimizations extends TestBase {
 
     private Connection conn;
     
@@ -36,9 +37,40 @@ public class TestOptimizations extends TestBase {
         deleteDb("optimizations");
         conn = getConnection("optimizations");
         testGroupSorted();
+        testInSelect();
         conn.close();
     }
     
+    private void testInSelect() throws SQLException {
+        boolean old = SysProperties.optimizeInJoin;
+        Db db = new Db(conn);
+        db.execute("CREATE TABLE TEST(A INT, B INT)");
+        db.execute("CREATE INDEX IDX ON TEST(A)");
+        db.execute("INSERT INTO TEST SELECT X/4, MOD(X, 4) FROM SYSTEM_RANGE(1, 16)");
+        db.execute("UPDATE TEST SET A = NULL WHERE A = 0");
+        db.execute("UPDATE TEST SET B = NULL WHERE B = 0");
+        Random random = new Random();
+        long seed = random.nextLong();
+        println("seed: " + seed);
+        for (int i = 0; i < 100; i++) {
+            String sql = "SELECT * FROM TEST T WHERE ";
+            sql += random.nextBoolean() ? "A" : "B";
+            sql += " IN(SELECT ";
+            sql += new String[] { "NULL", "0", "A", "B" }[random.nextInt(4)];
+            sql += " FROM TEST I WHERE I.";
+            sql += random.nextBoolean() ? "A" : "B";
+            sql += "=?) ORDER BY 1, 2";
+            int v = random.nextInt(3);
+            SysProperties.optimizeInJoin = false;
+            List a = db.prepare(sql).set(v).query();
+            SysProperties.optimizeInJoin = true;
+            List b = db.prepare(sql).set(v).query();
+            assertTrue(a.equals(b));
+        }
+        db.execute("DROP TABLE TEST");
+        SysProperties.optimizeInJoin = old;
+    }
+
     private void testGroupSorted() throws SQLException {
         Db db = new Db(conn);
         db.execute("CREATE TABLE TEST(A INT, B INT, C INT)");
@@ -92,6 +124,7 @@ public class TestOptimizations extends TestBase {
             }
             db.execute("DROP TABLE TEST_INDEXED");
         }
+        db.execute("DROP TABLE TEST");
     }
     
 }