fix parse dsn

jerry-00 · Dec 24, 2018 · cfa5741 · cfa5741
1 parent 881ca0d
commit cfa5741
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 6 deletions.
diff --git a/common/config.go b/common/config.go
@@ -289,9 +289,10 @@ func parseDSN(odbc string, d *dsn) *dsn {
 		userInfo = res[1]
 		hostInfo = res[2]
 		query = res[4]
-	} else {
+	}  else if res := regexp.MustCompile(`^(.*?)($|\?)(.*)`).FindStringSubmatch(odbc); len(res) > 3 {
 		// hostInfo
-		hostInfo = odbc
+		hostInfo = res[1]
+		query = res[3]
 	}
 
 	// 解析用户信息

diff --git a/common/config_test.go b/common/config_test.go
@@ -48,8 +48,8 @@ func TestParseDSN(t *testing.T) {
 		"user:password@hostname:3307",
 		"user:password@hostname:/database",
 		"user:password@:3307/database",
-		"user@hostname/dbname",
-		"user:pwd:pwd@pwd/pwd@hostname/dbname",
+		"user@hostname/database",
+		"user:pwd:pwd@pwd/pwd@hostname/database",
 		"user:password@",
 		"hostname:3307/database",
 		"@hostname:3307/database",

diff --git a/common/testdata/TestParseDSN.golden b/common/testdata/TestParseDSN.golden
@@ -3,8 +3,8 @@
 &common.dsn{Addr:"hostname:3307", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Version:999}
 &common.dsn{Addr:"hostname:3306", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Version:999}
 &common.dsn{Addr:"127.0.0.1:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Version:999}
-&common.dsn{Addr:"hostname:3306", Schema:"dbname", User:"user", Password:"", Charset:"utf8mb4", Disable:false, Version:999}
-&common.dsn{Addr:"hostname:3306", Schema:"dbname", User:"user", Password:"pwd:pwd@pwd/pwd", Charset:"utf8mb4", Disable:false, Version:999}
+&common.dsn{Addr:"hostname:3306", Schema:"database", User:"user", Password:"", Charset:"utf8mb4", Disable:false, Version:999}
+&common.dsn{Addr:"hostname:3306", Schema:"database", User:"user", Password:"pwd:pwd@pwd/pwd", Charset:"utf8mb4", Disable:false, Version:999}
 &common.dsn{Addr:"127.0.0.1:3306", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Version:999}
 &common.dsn{Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Version:999}
 &common.dsn{Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Version:999}