blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 03:05:05 +08:00
Code Issues Projects Releases Wiki Activity

fix(database/gdb): regular expression pattern for link configuration to be compitable with tidbcloud (#4064)

Browse Source
This commit is contained in:
Mr.Fan 2024-12-19 21:44:36 +08:00 committed by GitHub
parent 817ac36ce2
commit 4c2a78b7bf
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 35 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
database/gdb/gdb.go
View File

@ -708,7 +708,7 @@ const (
ctxKeyCatchSQL gctx.StrKey = `CtxKeyCatchSQL`
ctxKeyInternalProducedSQL gctx.StrKey = `CtxKeyInternalProducedSQL`
linkPattern = `(\w+):([\w\-\$]*):(.*?)@(\w+?)\((.+?)\)/{0,1}([^\?]*)\?{0,1}(.*)`
linkPattern = `^(\w+):(.*?):(.*?)@(\w+?)\((.+?)\)/{0,1}([^\?]*)\?{0,1}(.*?)$`
linkPatternDescription = `type:username:password@protocol(host:port)/dbname?param1=value1&...&paramN=valueN`
)

34
database/gdb/gdb_z_mysql_internal_test.go
View File

@ -295,6 +295,40 @@ func Test_parseConfigNodeLink_WithType(t *testing.T) {
t.Assert(newNode.Charset, `utf8`)
t.Assert(newNode.Protocol, `unix`)
})
// https://github.com/gogf/gf/issues/4059
gtest.C(t, func(t *gtest.T) {
node := &ConfigNode{
Link: "tidb:2hcmRccccxxx9Fizz.root:wP3xxxxPIDc@tcp(xxxx.tidbcloud.com:4000)/db_name?tls=true",
}
newNode, err := parseConfigNodeLink(node)
t.AssertNil(err)
t.Assert(newNode.Type, `tidb`)
t.Assert(newNode.User, `2hcmRccccxxx9Fizz.root`)
t.Assert(newNode.Pass, `wP3xxxxPIDc`)
t.Assert(newNode.Host, `xxxx.tidbcloud.com`)
t.Assert(newNode.Port, `4000`)
t.Assert(newNode.Name, `db_name`)
t.Assert(newNode.Extra, `tls=true`)
t.Assert(newNode.Charset, `utf8`)
t.Assert(newNode.Protocol, `tcp`)
})
gtest.C(t, func(t *gtest.T) {
node := &ConfigNode{
Type: "tidb",
Link: "2hcmRccccxxx9Fizz.root:wP3xxxxPIDc@tcp(xxxx.tidbcloud.com:4000)/db_name?tls=true",
}
newNode, err := parseConfigNodeLink(node)
t.AssertNil(err)
t.Assert(newNode.Type, `tidb`)
t.Assert(newNode.User, `2hcmRccccxxx9Fizz.root`)
t.Assert(newNode.Pass, `wP3xxxxPIDc`)
t.Assert(newNode.Host, `xxxx.tidbcloud.com`)
t.Assert(newNode.Port, `4000`)
t.Assert(newNode.Name, `db_name`)
t.Assert(newNode.Extra, `tls=true`)
t.Assert(newNode.Charset, `utf8`)
t.Assert(newNode.Protocol, `tcp`)
})
}
func Test_Func_doQuoteWord(t *testing.T) {