Support for database paths with backslashes on non Windows systems.

h2/src/docsrc/html/changelog.html

@@ -19,7 +19,8 @@ Change Log
 
 <h2>Next Version (unreleased)</h2>
 <ul>
-<li>Improved MS SQL Server and MySQL compatibility: support DELETE with TOP or LIMIT.
+<li>Support for database paths with backslashes on non Windows systems.
+</li><li>Improved MS SQL Server and MySQL compatibility: support DELETE with TOP or LIMIT.
 </li><li>Support for COSH, SINH, and TANH functions.
 </li><li>Support for the % operator (modulo) thanks to Noel Grandin.
 </li><li>Issue 288: Some right outer join queries failed to produce the correct result or

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

@@ -6,6 +6,7 @@
  */
 package org.h2.engine;
 
+import java.io.File;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.HashMap;
@@ -126,6 +127,13 @@ public class ConnectionInfo implements Cloneable {
         } else {
             persistent = true;
         }
+        if (persistent && !remote) {
+            if (File.separatorChar == '/') {
+                name = name.replace('\\', '/');
+            } else {
+                name = name.replace('/', '\\');
+            }
+        }
     }
 
     /**

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

@@ -10,6 +10,7 @@ import org.h2.test.TestBase;
 import org.h2.constant.ErrorCode;
 import org.h2.engine.ConnectionInfo;
 
+import java.io.File;
 import java.sql.DriverManager;
 import java.sql.SQLException;
 import java.util.Properties;
@@ -33,6 +34,7 @@ public class TestConnectionInfo extends TestBase {
     public void test() throws Exception {
         testConnectInitError();
         testConnectionInfo();
+        testName();
     }
 
     private void testConnectInitError() throws Exception {
@@ -69,4 +71,11 @@ public class TestConnectionInfo extends TestBase {
         assertEquals("undefined", connectionInfo.getProperty("CACHE_TYPE", "undefined"));
     }
     
+    private void testName() throws Exception {
+        char differentFileSeparator = File.separatorChar == '/' ? '\\' : '/';
+        ConnectionInfo connectionInfo = new ConnectionInfo("testdb" + differentFileSeparator + "subdir");
+        File file = new File("testdb" + File.separatorChar + "subdir");
+        assertEquals(file.getCanonicalPath(), connectionInfo.getName());
+    }
+
 }