Filesystem parameters like "split:" didn't work in server mode with baseDir set.

h2/src/docsrc/html/changelog.html

@@ -20,6 +20,7 @@ Change Log
 <h2>Next Version (unreleased)</h2>
 <ul><li>The experimental LOB storage mechanism now supports all features of the
     old one. To use it, set the system property "h2.lobInDatabase" to "true".
+</li><li>Filesystem parameters like "split:" didn't work in server mode with baseDir set.
 </li></ul>
 
 <h2>Version 1.2.133 (2010-04-10)</h2>

h2/src/main/org/h2/engine/ConnectionInfo.java

@@ -131,8 +131,17 @@ public class ConnectionInfo implements Cloneable {
      */
     public void setBaseDir(String dir) {
         if (persistent) {
-            if (!name.startsWith("~")) {
-                name = dir + SysProperties.FILE_SEPARATOR + name;
+            String fileSystemPrefix = "";
+            int colonIndex = name.lastIndexOf(':');
+            if (colonIndex != -1) {
+                // cut "split:" and similar things
+                fileSystemPrefix = name.substring(0, colonIndex+1);
+                name = name.substring(colonIndex+1);
+            }
+            if (name.startsWith("~")) {
+                name = fileSystemPrefix + name;
+            } else {
+                name = fileSystemPrefix + dir + SysProperties.FILE_SEPARATOR + name;
             }
         }
     }

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

@@ -672,6 +672,16 @@ public class TestTools extends TestBase {
         } catch (SQLException e) {
             // ignore
         }
+        // Test filesystem prefix
+        deleteDb("testsplit");
+        server = Server.createTcpServer(
+                        "-baseDir", baseDir,
+                        "-tcpPort", "9192",
+                        "-tcpAllowOthers").start();
+        conn = DriverManager.getConnection("jdbc:h2:tcp://localhost:9192/split:testsplit", "sa", "");
+        conn.close();
+        server.stop();
+        deleteDb("testsplit");
     }
 
 }