Merge pull request #1206 from katzyn/tests

Forbid reconnects in non-regular modes in TestScript

h2/src/main/org/h2/jdbc/JdbcConnection.java

@@ -43,6 +43,8 @@ import org.h2.engine.Mode;
 import org.h2.engine.SessionInterface;
 import org.h2.engine.SessionRemote;
 import org.h2.engine.SysProperties;
+import org.h2.engine.Mode.ModeEnum;
+import org.h2.engine.Session;
 import org.h2.message.DbException;
 import org.h2.message.TraceObject;
 import org.h2.result.ResultInterface;
@@ -2121,4 +2123,12 @@ public class JdbcConnection extends TraceObject
         return mode;
     }
 
+    /**
+     * INTERNAL
+     */
+    public boolean isRegularMode() throws SQLException {
+        // Clear cached mode if any (required by tests)
+        mode = null;
+        return getMode().getEnum() == ModeEnum.REGULAR;
+    }
 }

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

@@ -26,6 +26,7 @@ import java.util.Random;
 
 import org.h2.api.ErrorCode;
 import org.h2.engine.SysProperties;
+import org.h2.jdbc.JdbcConnection;
 import org.h2.test.TestAll;
 import org.h2.test.TestBase;
 import org.h2.util.StringUtils;
@@ -194,7 +195,7 @@ public class TestScript extends TestBase {
         stat = conn.createStatement();
         out = new PrintStream(new FileOutputStream(outFile));
         errors = new StringBuilder();
-        testFile(BASE_DIR + scriptFileName);
+        testFile(BASE_DIR + scriptFileName, !scriptFileName.equals("functions/system/set.sql"));
         conn.close();
         out.close();
         if (errors.length() > 0) {
@@ -251,7 +252,7 @@ public class TestScript extends TestBase {
         }
     }
 
-    private void testFile(String inFile) throws Exception {
+    private void testFile(String inFile, boolean allowReconnect) throws Exception {
         InputStream is = getClass().getClassLoader().getResourceAsStream(inFile);
         if (is == null) {
             throw new IOException("could not find " + inFile);
@@ -273,7 +274,7 @@ public class TestScript extends TestBase {
                 buff.append(sql, 0, sql.length() - 1);
                 sql = buff.toString();
                 buff = new StringBuilder();
-                process(sql);
+                process(sql, allowReconnect);
             } else {
                 write(sql);
                 buff.append(sql);
@@ -296,9 +297,9 @@ public class TestScript extends TestBase {
         return false;
     }
 
-    private void process(String sql) throws Exception {
-        if (reconnectOften) {
-            if (!containsTempTables()) {
+    private void process(String sql, boolean allowReconnect) throws Exception {
+        if (allowReconnect && reconnectOften) {
+            if (!containsTempTables() && ((JdbcConnection) conn).isRegularMode() && conn.getSchema().equals("PUBLIC")) {
                 boolean autocommit = conn.getAutoCommit();
                 if (autocommit && random.nextInt(10) < 1) {
                     // reconnect 10% of the time