fix configuration management for package gdb (#2163)

database/gdb/gdb.go

@@ -304,6 +304,9 @@ const (
 	ctxKeyForDB               gctx.StrKey = `CtxKeyForDB`
 	ctxKeyCatchSQL            gctx.StrKey = `CtxKeyCatchSQL`
 	ctxKeyInternalProducedSQL gctx.StrKey = `CtxKeyInternalProducedSQL`
+
+	// type:[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...&paramN=valueN]
+	linkPattern = `(\w+):([\w\-]*):(.*?)@(\w+?)\((.+?)\)/{0,1}([\w\-]*)\?{0,1}(.*)`
 )
 
 const (
@@ -372,9 +375,6 @@ var (
 
 	// tableFieldsMap caches the table information retrieved from database.
 	tableFieldsMap = gmap.NewStrAnyMap(true)
-
-	// type:[username[:password]@][protocol[(address)]]/dbname[?param1=value1&...&paramN=valueN]
-	linkPattern = `(\w+):([\w\-]*):(.*?)@(\w+?)\((.+?)\)/{0,1}([\w\-]*)\?{0,1}(.*)`
 )
 
 func init() {
@@ -426,6 +426,9 @@ func NewByGroup(group ...string) (db DB, err error) {
 
 // newDBByConfigNode creates and returns an ORM object with given configuration node and group name.
 func newDBByConfigNode(node *ConfigNode, group string) (db DB, err error) {
+	if node.Link != "" {
+		node = parseConfigNodeLink(node)
+	}
 	c := &Core{
 		group:  group,
 		debug:  gtype.NewBool(),

database/gdb/gdb_core_config.go

@@ -14,6 +14,7 @@ import (
 	"github.com/gogf/gf/v2/os/glog"
 	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
+	"github.com/gogf/gf/v2/util/gconv"
 )
 
 // Config is the configuration management object.
@@ -105,6 +106,9 @@ func AddConfigNode(group string, node ConfigNode) {
 
 // parseConfigNode parses `Link` configuration syntax.
 func parseConfigNode(node ConfigNode) ConfigNode {
+	if node.Link != "" {
+		node = *parseConfigNodeLink(&node)
+	}
 	if node.Link != "" && node.Type == "" {
 		match, _ := gregex.MatchString(`([a-z]+):(.+)`, node.Link)
 		if len(match) == 3 {
@@ -245,3 +249,41 @@ func (c *Core) GetPrefix() string {
 func (c *Core) GetSchema() string {
 	return c.schema
 }
+
+func parseConfigNodeLink(node *ConfigNode) *ConfigNode {
+	var match []string
+	if node.Link != "" {
+		match, _ = gregex.MatchString(linkPattern, node.Link)
+		if len(match) > 5 {
+			node.Type = match[1]
+			node.User = match[2]
+			node.Pass = match[3]
+			node.Protocol = match[4]
+			array := gstr.Split(match[5], ":")
+			if len(array) == 2 {
+				node.Host = array[0]
+				node.Port = array[1]
+				node.Name = match[6]
+			} else {
+				node.Name = match[5]
+			}
+			if len(match) > 6 {
+				node.Extra = match[7]
+			}
+			node.Link = ""
+		}
+	}
+	if node.Extra != "" {
+		if m, _ := gstr.Parse(node.Extra); len(m) > 0 {
+			_ = gconv.Struct(m, &node)
+		}
+	}
+	// Default value checks.
+	if node.Charset == "" {
+		node.Charset = defaultCharset
+	}
+	if node.Protocol == "" {
+		node.Protocol = defaultProtocol
+	}
+	return node
+}

database/gdb/gdb_driver_wrapper_db.go

@@ -13,9 +13,7 @@ import (
 
 	"github.com/gogf/gf/v2/errors/gcode"
 	"github.com/gogf/gf/v2/errors/gerror"
-	"github.com/gogf/gf/v2/text/gregex"
 	"github.com/gogf/gf/v2/text/gstr"
-	"github.com/gogf/gf/v2/util/gconv"
 	"github.com/gogf/gf/v2/util/gutil"
 )
 
@@ -27,9 +25,6 @@ type DriverWrapperDB struct {
 // Open creates and returns an underlying sql.DB object for pgsql.
 // https://pkg.go.dev/github.com/lib/pq
 func (d *DriverWrapperDB) Open(config *ConfigNode) (db *sql.DB, err error) {
-	if config.Link != "" {
-		config = parseConfigNodeLink(config)
-	}
 	return d.DB.Open(config)
 }
 
@@ -83,41 +78,3 @@ func (d *DriverWrapperDB) TableFields(ctx context.Context, table string, schema
 	}
 	return
 }
-
-func parseConfigNodeLink(node *ConfigNode) *ConfigNode {
-	var match []string
-	if node.Link != "" {
-		match, _ = gregex.MatchString(linkPattern, node.Link)
-		if len(match) > 5 {
-			node.Type = match[1]
-			node.User = match[2]
-			node.Pass = match[3]
-			node.Protocol = match[4]
-			array := gstr.Split(match[5], ":")
-			if len(array) == 2 {
-				node.Host = array[0]
-				node.Port = array[1]
-				node.Name = match[6]
-			} else {
-				node.Name = match[5]
-			}
-			if len(match) > 6 {
-				node.Extra = match[7]
-			}
-			node.Link = ""
-		}
-	}
-	if node.Extra != "" {
-		if m, _ := gstr.Parse(node.Extra); len(m) > 0 {
-			_ = gconv.Struct(m, &node)
-		}
-	}
-	// Default value checks.
-	if node.Charset == "" {
-		node.Charset = defaultCharset
-	}
-	if node.Protocol == "" {
-		node.Protocol = defaultProtocol
-	}
-	return node
-}