rogee/atomctl
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

feat: add gen model

Browse Source
This commit is contained in:
Rogee
2024-12-19 14:40:13 +08:00
parent ab9e8ed8b4
commit 797ff49fc7
7 changed files with 347 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
pkg/postgres/postgres.go
View File

@@ -9,7 +9,7 @@ import (
"github.com/spf13/viper"
)
func GetDB(cfgFile string) (*sql.DB, error) {
func GetDB(cfgFile string) (*sql.DB, *Config, error) {
var conf Config
v := viper.New()
v.SetConfigType("toml")
@@ -17,23 +17,23 @@ func GetDB(cfgFile string) (*sql.DB, error) {
v.AddConfigPath(".")
if err := v.ReadInConfig(); err != nil {
return nil, errors.Wrap(err, "read config file")
return nil, &conf, errors.Wrap(err, "read config file")
}
if err := v.UnmarshalKey(DefaultPrefix, &conf); err != nil {
return nil, errors.Wrap(err, "unmarshal config")
return nil, &conf, errors.Wrap(err, "unmarshal config")
}
log.Debugf("connect postgres with dsn: '%s'", conf.DSN())
db, err := sql.Open("postgres", conf.DSN())
if err != nil {
return nil, errors.Wrap(err, "connect database")
return nil, &conf, errors.Wrap(err, "connect database")
}
if err := db.Ping(); err != nil {
db.Close()
return nil, errors.Wrap(err, "ping database")
return nil, &conf, errors.Wrap(err, "ping database")
}
return db, err
return db, &conf, err
}