bingyi/gf
1
0
Fork 0
mirror of https://gitee.com/johng/gf synced 2026-07-06 21:45:34 +08:00
Code Issues Packages Projects Releases Wiki Activity

improve instance creating of database for package gins

Browse Source
This commit is contained in:
John Guo
2021-11-27 11:53:05 +08:00
parent 817c3ce698
commit bf8afc96e4
1 changed files with 9 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
frame/gins/gins_database.go
View File

@ -60,20 +60,21 @@ func Database(name ...string) gdb.DB {
configFilePath string
)
if fileConfig, ok := Config().GetAdapter().(*gcfg.AdapterFile); ok {
if configFilePath, err = fileConfig.GetFilePath(); configFilePath == "" {
exampleFileName := "config.example.toml"
if exampleConfigFilePath, _ := fileConfig.GetFilePath(exampleFileName); exampleConfigFilePath != "" {
err = gerror.WrapCodef(
if configFilePath, _ = fileConfig.GetFilePath(); configFilePath == "" {
var (
exampleFileName = "config.example.toml"
exampleConfigFilePath string
)
if exampleConfigFilePath, _ = fileConfig.GetFilePath(exampleFileName); exampleConfigFilePath != "" {
err = gerror.NewCodef(
gcode.CodeMissingConfiguration,
err,
`configuration file "%s" not found, but found "%s", did you miss renaming the example configuration file?`,
fileConfig.GetFileName(),
exampleFileName,
)
} else {
err = gerror.WrapCodef(
err = gerror.NewCodef(
gcode.CodeMissingConfiguration,
err,
`configuration file "%s" not found, did you miss the configuration file or the misspell the configuration file name?`,
fileConfig.GetFileName(),
)
@ -85,9 +86,8 @@ func Database(name ...string) gdb.DB {
}
// Panic if nothing found in Config object or in gdb configuration.
if len(configMap) == 0 && !gdb.IsConfigured() {
err = gerror.WrapCodef(
err = gerror.NewCodef(
gcode.CodeMissingConfiguration,
err,
`database initialization failed: "%s" node not found, is configuration file or configuration node missing?`,
configNodeNameDatabase,
)