change example dub.json & fix #20

huntlabs · Sep 10, 2018 · 8dc33f9 · 8dc33f9
1 parent d2b2472
commit 8dc33f9
Show file tree

Hide file tree

Showing 6 changed files with 18 additions and 9 deletions.
diff --git a/examples/mysql/dub.json b/examples/mysql/dub.json
@@ -3,7 +3,7 @@
     "authors": ["putao"],
     "targetType": "executable",
     "dependencies": {
-        "database": {"path":"../../"}
+        "hunt-database": {"path":"../../"}
     },
     "description": "A minimal D application.",
     "copyright": "Copyright © 2017, Zhang",
@@ -12,7 +12,7 @@
         {
             "name": "default",
             "subConfigurations": {
-                "database": "mysql"
+                "hunt-database": "mysql"
             }
         }
     ]

diff --git a/examples/mysqlMultiThread/dub.json b/examples/mysqlMultiThread/dub.json
@@ -3,7 +3,7 @@
     "authors": ["putao"],
     "targetType": "executable",
     "dependencies": {
-        "database": {"path":"../../"}
+        "hunt-database": {"path":"../../"}
     },
     "description": "A minimal D application.",
     "copyright": "Copyright © 2017, Zhang",
@@ -12,7 +12,7 @@
         {
             "name": "default",
             "subConfigurations": {
-                "database": "mysql"
+                "hunt-database": "mysql"
             }
         }
     ]

diff --git a/examples/postgresql/dub.json b/examples/postgresql/dub.json
@@ -3,7 +3,7 @@
     "authors": ["putao"],
     "targetType": "executable",
     "dependencies": {
-        "database": {"path":"../../"}
+        "hunt-database": {"path":"../../"}
     },
     "description": "A minimal D application.",
     "copyright": "Copyright © 2017, Zhang",
@@ -12,7 +12,7 @@
         {
             "name": "default",
             "subConfigurations": {
-                "database": "postgresql"
+                "hunt-database": "postgresql"
             }
         }
     ]

diff --git a/examples/sqlite/dub.json b/examples/sqlite/dub.json
@@ -3,7 +3,7 @@
     "authors": ["putao"],
     "targetType": "executable",
     "dependencies": {
-        "database": {"path":"../../"}
+    "hunt-database": {"path":"../../"}
     },
     "description": "A minimal D application.",
     "copyright": "Copyright ? 2017, Zhang",
@@ -12,7 +12,7 @@
         {
             "name": "default",
             "subConfigurations": {
-                "database": "sqlite"
+                "hunt-database": "sqlite"
             }
         }
     ]

diff --git a/hunt-database-test-default b/hunt-database-test-default
diff --git a/source/hunt/database/url.d b/source/hunt/database/url.d
@@ -75,11 +75,20 @@ bool tryParseURL(string value, out URL url) {
 
     url.scheme = value[0 .. i - 1];
 
+    /// special
+    if(url.scheme == "sqlite")
+    {
+        url.path = value[i + 2 .. $];
+        return true;
+    }
+
     value = value[i + 2 .. $];
 
     i = value.indexOf("@");
     if( i == -1) // no user or password
+    {    
         return false;
+    }
 
     //user:password
     auto userpass = value[0 .. i];
@@ -167,7 +176,7 @@ unittest {
     writeln(parseURL("mysql://root@127.0.0.1:3435/test?charset=utf"));
     writeln(parseURL("mysql://root:%324#4543sdf=@127.0.0.1:3435/test?charset=utf"));
     writeln(parseURL("postgresql://user@host:123/database"));
-
+    writeln(parseURL("sqlite:///./testDB.db"));
 
 }