When creating a database from a recovery script, the same user can now be used…

When creating a database from a recovery script, the same user can now be used (CREATE USER now always includes IF EXISTS).

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

@@ -201,13 +201,12 @@ public class TestRunscript extends TestBase implements Trigger {
             Recover.execute(getBaseDir(), "runscript");
 
             deleteDb("runscriptRestoreRecover");
-            Connection conn3 = getConnection("runscriptRestoreRecover", "tempUser", getPassword());
+            Connection conn3 = getConnection("runscriptRestoreRecover");
             Statement stat3 = conn3.createStatement();
             stat3.execute("runscript from '" + getBaseDir() + "/runscript.h2.sql'");
             conn3.close();
             conn3 = getConnection("runscriptRestoreRecover");
             stat3 = conn3.createStatement();
-            stat3.execute("drop user tempUser");
 
             if (config.cipher != null) {
                 ChangeFileEncryption.execute(getBaseDir(), "runscript", config.cipher, null, getFilePassword().toCharArray(), true);

h2/src/test/org/h2/test/unit/TestRecovery.java

@@ -38,6 +38,7 @@ public class TestRecovery extends TestBase {
 
     private void testCompressedAndUncompressed() throws SQLException {
         DeleteDbFiles.execute(getBaseDir(), "recovery", true);
+        DeleteDbFiles.execute(getBaseDir(), "recovery2", true);
         org.h2.Driver.load();
         Connection conn = getConnection("recovery");
         Statement stat = conn.createStatement();
@@ -48,12 +49,11 @@ public class TestRecovery extends TestBase {
         conn.close();
         Recover rec = new Recover();
         rec.runTool("-dir", getBaseDir(), "-db", "recovery");
-        Connection conn2 = getConnection("recovery2", "diff", "");
+        Connection conn2 = getConnection("recovery2");
         Statement stat2 = conn2.createStatement();
         String name = "recovery.h2.sql";
         stat2.execute("runscript from '" + getBaseDir() + "/" + name + "'");
         stat2.execute("select * from test");
-        stat2.execute("drop user diff");
         conn2.close();
 
         conn = getConnection("recovery");
@@ -92,13 +92,12 @@ public class TestRecovery extends TestBase {
         String out = new String(buff.toByteArray());
         assertTrue(out.indexOf("Created file") >= 0);
 
-        Connection conn2 = getConnection("recovery2", "diff", "");
+        Connection conn2 = getConnection("recovery2");
         Statement stat2 = conn2.createStatement();
         String name = "recovery.h2.sql";
 
         stat2.execute("runscript from '" + getBaseDir() + "/" + name + "'");
         stat2.execute("select * from test");
-        stat2.execute("drop user diff");
         conn2.close();
 
         conn = getConnection("recovery");

h2/src/test/org/h2/test/unit/TestTools.java

@@ -64,7 +64,6 @@ public class TestTools extends TestBase {
         if (config.networked) {
             return;
         }
-        testSimpleResultSet();
         org.h2.Driver.load();
         testJdbcDriverUtils();
         testWrongServer();
@@ -84,6 +83,7 @@ public class TestTools extends TestBase {
         testScriptRunscript();
         testBackupRestore();
         testRecover();
+        testSimpleResultSet();
         deleteDb("utils");
         IOUtils.delete(getBaseDir() + "/b2.sql");
         IOUtils.delete(getBaseDir() + "/b2.sql.txt");
@@ -473,7 +473,7 @@ public class TestTools extends TestBase {
             }
         }
 
-        conn = DriverManager.getConnection(url, "another", "another");
+        conn = DriverManager.getConnection(url);
         stat = conn.createStatement();
         String suffix = ".h2.sql";
         stat.execute("runscript from '" + getBaseDir() + "/toolsRecover" + suffix + "'");