mirror of
https://gitee.com/johng/gf
synced 2026-07-07 06:15:15 +08:00
This pull request standardizes the use of the Go 1.18+ `any` type alias
instead of `interface{}` throughout the codebase. The change improves
code readability and aligns with modern Go best practices. The update
touches many files, including core data structures, code generation
templates, logging utilities, and test data, ensuring consistency across
all usages.
**Type alias migration to `any`:**
* Replaced all instances of `interface{}` with `any` in core data
structures such as `garray` and in generated model structs (e.g.,
`TableUser`, `User1`, `User2`) to modernize type usage.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[3]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[4]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[5]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[6]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
* Updated function signatures, method parameters, and return types from
`interface{}` to `any` in various parts of the codebase, including code
generation, service logic, and logging utilities (e.g., `mlog`).
[[1]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[2]](diffhunk://#diff-2b1953fb78cf3593d8c2c7d911e95b65fd0b847c30ed0b4d167d16fe6d781235L54-R74)
[[3]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[4]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
[[5]](diffhunk://#diff-c5d51d56f487779a2b6207c7ad26c7a20bbadcc846ce094fe60ab4cabff58c51L107-R107)
[[6]](diffhunk://#diff-f96e6a9fdb416eb1804ceaba1fe0ac637bff22c43837f8bb849c2366ce72d4a1L116-R121)
[[7]](diffhunk://#diff-f94c83a1b08ae060d9346f4a6031fc4a7b9a0b894e02d9afaa09018b6598eac0L112-R112)
[[8]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L36-R36)
[[9]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L74-R74)
[[10]](diffhunk://#diff-748b11dbe8828dd4c040ec23cae0b8fe57ecf0a2d1b7694ea39102294e633c64L96-R96)
**Generated code and templates:**
* Adjusted generated files and code generation templates to output `any`
instead of `interface{}` for relevant struct fields and function
signatures, ensuring that new code generation aligns with the updated
convention.
[[1]](diffhunk://#diff-6c19859cb32c7516ea95ddc8f8235460818eb2f24d2204308e0d9e1b19e7d90fL15-R19)
[[2]](diffhunk://#diff-a15ba2f5e830b4833c47b902515a4f9e5a4f83a3707698f3229b307ec3776b41L15-R18)
[[3]](diffhunk://#diff-52e0837e84d49221d1b810d88fdf78221f36cffcd664fb42f8aba49a79b974dcL15-R19)
[[4]](diffhunk://#diff-11c3457d1a23a4ca6ecd00d6b856289774936b6a708384cf03aff164044e7546L15-R19)
[[5]](diffhunk://#diff-2cff9cf8e6a0cc34087326d8c8149c3bbaf74c76fdbdf5a73daed13cc04249e1L15-R19)
[[6]](diffhunk://#diff-175edfeea54490b8fe4e18ffcbea5835efaf8f0b8acf623359073987cae7eb76L48-R55)
[[7]](diffhunk://#diff-e001b7a4b63603b9b14f00de78a4d570bb76c5f57d856a24643f071032e12356L66-R73)
[[8]](diffhunk://#diff-5582954e8a9983988dc8854ad82067fb2ac6269b988e07357ad8db1dfec5f1a0L39-R41)
**Container and utility updates:**
* Refactored the `garray` container implementation and related
constructors/methods to use `[]any` instead of `[]interface{}`, along
with corresponding function signatures.
[[1]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L31-R31)
[[2]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L52-R52)
[[3]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L62-R62)
[[4]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L73-R86)
[[5]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L96-R97)
[[6]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L107-R114)
[[7]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L124-R124)
[[8]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L135-R143)
[[9]](diffhunk://#diff-3a1259e160a4dfa5fe49dfe739fbdb986c0d0a2220a709882ea48d3ae1b8f911L167-R167)
These changes collectively modernize the codebase and prepare it for
future Go developments by using the idiomatic `any` type.
179 lines
5.3 KiB
Go
179 lines
5.3 KiB
Go
// Copyright GoFrame Author(https://goframe.org). All Rights Reserved.
|
|
//
|
|
// This Source Code Form is subject to the terms of the MIT License.
|
|
// If a copy of the MIT was not distributed with this file,
|
|
// You can obtain one at https://github.com/gogf/gf.
|
|
|
|
package gins
|
|
|
|
import (
|
|
"context"
|
|
"fmt"
|
|
|
|
"github.com/gogf/gf/v2/database/gdb"
|
|
"github.com/gogf/gf/v2/errors/gcode"
|
|
"github.com/gogf/gf/v2/errors/gerror"
|
|
"github.com/gogf/gf/v2/internal/consts"
|
|
"github.com/gogf/gf/v2/internal/instance"
|
|
"github.com/gogf/gf/v2/internal/intlog"
|
|
"github.com/gogf/gf/v2/os/gcfg"
|
|
"github.com/gogf/gf/v2/os/glog"
|
|
"github.com/gogf/gf/v2/util/gconv"
|
|
"github.com/gogf/gf/v2/util/gutil"
|
|
)
|
|
|
|
// Database returns an instance of database ORM object with specified configuration group name.
|
|
// Note that it panics if any error occurs duration instance creating.
|
|
func Database(name ...string) gdb.DB {
|
|
var (
|
|
ctx = context.Background()
|
|
group = gdb.DefaultGroupName
|
|
)
|
|
|
|
if len(name) > 0 && name[0] != "" {
|
|
group = name[0]
|
|
}
|
|
instanceKey := fmt.Sprintf("%s.%s", frameCoreComponentNameDatabase, group)
|
|
db := instance.GetOrSetFuncLock(instanceKey, func() any {
|
|
// It ignores returned error to avoid file no found error while it's not necessary.
|
|
var (
|
|
configMap map[string]any
|
|
configNodeKey = consts.ConfigNodeNameDatabase
|
|
)
|
|
// It firstly searches the configuration of the instance name.
|
|
if configData, _ := Config().Data(ctx); len(configData) > 0 {
|
|
if v, _ := gutil.MapPossibleItemByKey(configData, consts.ConfigNodeNameDatabase); v != "" {
|
|
configNodeKey = v
|
|
}
|
|
}
|
|
if v, _ := Config().Get(ctx, configNodeKey); !v.IsEmpty() {
|
|
configMap = v.Map()
|
|
}
|
|
// No configuration found, it formats and panics error.
|
|
if len(configMap) == 0 && !gdb.IsConfigured() {
|
|
// File configuration object checks.
|
|
var err error
|
|
if fileConfig, ok := Config().GetAdapter().(*gcfg.AdapterFile); ok {
|
|
if _, err = fileConfig.GetFilePath(); err != nil {
|
|
panic(gerror.WrapCode(gcode.CodeMissingConfiguration, err,
|
|
`configuration not found, did you miss the configuration file or misspell the configuration file name`,
|
|
))
|
|
}
|
|
}
|
|
// Panic if nothing found in Config object or in gdb configuration.
|
|
if len(configMap) == 0 && !gdb.IsConfigured() {
|
|
panic(gerror.NewCodef(
|
|
gcode.CodeMissingConfiguration,
|
|
`database initialization failed: configuration missing for database node "%s"`,
|
|
consts.ConfigNodeNameDatabase,
|
|
))
|
|
}
|
|
}
|
|
|
|
if len(configMap) == 0 {
|
|
configMap = make(map[string]any)
|
|
}
|
|
// Parse `m` as map-slice and adds it to global configurations for package gdb.
|
|
for g, groupConfig := range configMap {
|
|
cg := gdb.ConfigGroup{}
|
|
switch value := groupConfig.(type) {
|
|
case []any:
|
|
for _, v := range value {
|
|
if node := parseDBConfigNode(v); node != nil {
|
|
cg = append(cg, *node)
|
|
}
|
|
}
|
|
case map[string]any:
|
|
if node := parseDBConfigNode(value); node != nil {
|
|
cg = append(cg, *node)
|
|
}
|
|
}
|
|
if len(cg) > 0 {
|
|
if gdb.GetConfig(group) == nil {
|
|
intlog.Printf(ctx, "add configuration for group: %s, %#v", g, cg)
|
|
if err := gdb.SetConfigGroup(g, cg); err != nil {
|
|
panic(err)
|
|
}
|
|
} else {
|
|
intlog.Printf(ctx, "ignore configuration as it already exists for group: %s, %#v", g, cg)
|
|
intlog.Printf(ctx, "%s, %#v", g, cg)
|
|
}
|
|
}
|
|
}
|
|
// Parse `m` as a single node configuration,
|
|
// which is the default group configuration.
|
|
if node := parseDBConfigNode(configMap); node != nil {
|
|
cg := gdb.ConfigGroup{}
|
|
if node.Link != "" || node.Host != "" {
|
|
cg = append(cg, *node)
|
|
}
|
|
if len(cg) > 0 {
|
|
if gdb.GetConfig(group) == nil {
|
|
intlog.Printf(ctx, "add configuration for group: %s, %#v", gdb.DefaultGroupName, cg)
|
|
if err := gdb.SetConfigGroup(gdb.DefaultGroupName, cg); err != nil {
|
|
panic(err)
|
|
}
|
|
} else {
|
|
intlog.Printf(
|
|
ctx,
|
|
"ignore configuration as it already exists for group: %s, %#v",
|
|
gdb.DefaultGroupName, cg,
|
|
)
|
|
intlog.Printf(ctx, "%s, %#v", gdb.DefaultGroupName, cg)
|
|
}
|
|
}
|
|
}
|
|
|
|
// Create a new ORM object with given configurations.
|
|
if db, err := gdb.NewByGroup(name...); err == nil {
|
|
// Initialize logger for ORM.
|
|
var (
|
|
loggerConfigMap map[string]any
|
|
loggerNodeName = fmt.Sprintf("%s.%s", configNodeKey, consts.ConfigNodeNameLogger)
|
|
)
|
|
if v, _ := Config().Get(ctx, loggerNodeName); !v.IsEmpty() {
|
|
loggerConfigMap = v.Map()
|
|
}
|
|
if len(loggerConfigMap) == 0 {
|
|
if v, _ := Config().Get(ctx, configNodeKey); !v.IsEmpty() {
|
|
loggerConfigMap = v.Map()
|
|
}
|
|
}
|
|
if len(loggerConfigMap) > 0 {
|
|
if logger, ok := db.GetLogger().(*glog.Logger); ok {
|
|
if err = logger.SetConfigWithMap(loggerConfigMap); err != nil {
|
|
panic(err)
|
|
}
|
|
}
|
|
}
|
|
return db
|
|
} else {
|
|
// If panics, often because it does not find its configuration for given group.
|
|
panic(err)
|
|
}
|
|
})
|
|
if db != nil {
|
|
return db.(gdb.DB)
|
|
}
|
|
return nil
|
|
}
|
|
|
|
func parseDBConfigNode(value any) *gdb.ConfigNode {
|
|
nodeMap, ok := value.(map[string]any)
|
|
if !ok {
|
|
return nil
|
|
}
|
|
var (
|
|
node = &gdb.ConfigNode{}
|
|
err = gconv.Struct(nodeMap, node)
|
|
)
|
|
if err != nil {
|
|
panic(err)
|
|
}
|
|
// Find possible `Link` configuration content.
|
|
if _, v := gutil.MapPossibleItemByKey(nodeMap, "Link"); v != nil {
|
|
node.Link = gconv.String(v)
|
|
}
|
|
return node
|
|
}
|