Skip to content

S
soar

m0_67397764 / soar
与 Fork 源项目一致

Fork自 Xiaomi / soar

通知 1
Star 0
Fork 0
S
soar

体验新版 GitCode，发现更多精彩内容 >>

提交 5c730e2b 编写于 作者: martianzhang's avatar martianzhang
浏览文件
操作

Merge PR #175

上级 295553b2 cfa57413
显示空白变更内容
内联 并排
Showing with 7 addition and 6 deletion
common/config.go
浏览文件 @ 5c730e2b
...@@ -294,9 +294,10 @@ func parseDSN(odbc string, d *Dsn) *Dsn { ...@@ -294,9 +294,10 @@ func parseDSN(odbc string, d *Dsn) *Dsn {
userInfo = res[1] userInfo = res[1]
hostInfo = res[2] hostInfo = res[2]
query = res[4] query = res[4]
} else { } else if res := regexp.MustCompile(`^(.*?)($|\?)(.*)`).FindStringSubmatch(odbc); len(res) > 3 {
// hostInfo // hostInfo
hostInfo = odbc hostInfo = res[1]
query = res[3]
} }
// 解析用户信息 // 解析用户信息
......
common/config_test.go
浏览文件 @ 5c730e2b
...@@ -60,8 +60,8 @@ func TestParseDSN(t *testing.T) { ...@@ -60,8 +60,8 @@ func TestParseDSN(t *testing.T) {
"user:password@hostname:3307", "user:password@hostname:3307",
"user:password@hostname:/database", "user:password@hostname:/database",
"user:password@:3307/database", "user:password@:3307/database",
"user@hostname/dbname", "user@hostname/database",
"user:pwd:pwd@pwd/pwd@hostname/dbname", "user:pwd:pwd@pwd/pwd@hostname/database",
"user:password@", "user:password@",
"hostname:3307/database", "hostname:3307/database",
"@hostname:3307/database", "@hostname:3307/database",
......
common/testdata/TestParseDSN.golden
浏览文件 @ 5c730e2b
...@@ -3,8 +3,8 @@ ...@@ -3,8 +3,8 @@
&common.Dsn{Net:"", Addr:"hostname:3307", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3307", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"hostname:3306", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3306", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"127.0.0.1:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"127.0.0.1:3307", Schema:"database", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"hostname:3306", Schema:"dbname", User:"user", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3306", Schema:"database", User:"user", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"hostname:3306", Schema:"dbname", User:"user", Password:"pwd:pwd@pwd/pwd", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3306", Schema:"database", User:"user", Password:"pwd:pwd@pwd/pwd", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"127.0.0.1:3306", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"127.0.0.1:3306", Schema:"information_schema", User:"user", Password:"password", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
&common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999} &common.Dsn{Net:"", Addr:"hostname:3307", Schema:"database", User:"", Password:"", Charset:"utf8mb4", Disable:false, Timeout:0, ReadTimeout:0, WriteTimeout:0, Version:999}
......
Markdown is supported
0% 或 .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑！
想要评论请 注册 或