Update models/init.go: 修改变量名

pull/1626/head
VigorFox 3 years ago committed by GitHub
parent 3946e08c30
commit f8e2cf5f96
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

@ -25,24 +25,24 @@ func Init() {
var ( var (
db *gorm.DB db *gorm.DB
err error err error
confDataType string = conf.DatabaseConfig.Type confDBType string = conf.DatabaseConfig.Type
) )
// 兼容已有配置中的 "sqlite3" 配置项 // 兼容已有配置中的 "sqlite3" 配置项
if confDataType == "sqlite3" { if confDBType == "sqlite3" {
confDataType = "sqlite" confDBType = "sqlite"
} }
if gin.Mode() == gin.TestMode { if gin.Mode() == gin.TestMode {
// 测试模式下,使用内存数据库 // 测试模式下,使用内存数据库
db, err = gorm.Open("sqlite", ":memory:") db, err = gorm.Open("sqlite", ":memory:")
} else { } else {
switch confDataType { switch confDBType {
case "UNSET", "sqlite": case "UNSET", "sqlite":
// 未指定数据库或者明确指定为 sqlite 时,使用 SQLite 数据库 // 未指定数据库或者明确指定为 sqlite 时,使用 SQLite 数据库
db, err = gorm.Open("sqlite", util.RelativePath(conf.DatabaseConfig.DBFile)) db, err = gorm.Open("sqlite", util.RelativePath(conf.DatabaseConfig.DBFile))
case "postgres": case "postgres":
db, err = gorm.Open(confDataType, fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable", db, err = gorm.Open(confDBType, fmt.Sprintf("host=%s user=%s password=%s dbname=%s port=%d sslmode=disable",
conf.DatabaseConfig.Host, conf.DatabaseConfig.Host,
conf.DatabaseConfig.User, conf.DatabaseConfig.User,
conf.DatabaseConfig.Password, conf.DatabaseConfig.Password,
@ -59,14 +59,14 @@ func Init() {
conf.DatabaseConfig.Port) conf.DatabaseConfig.Port)
} }
db, err = gorm.Open(confDataType, fmt.Sprintf("%s:%s@%s/%s?charset=%s&parseTime=True&loc=Local", db, err = gorm.Open(confDBType, fmt.Sprintf("%s:%s@%s/%s?charset=%s&parseTime=True&loc=Local",
conf.DatabaseConfig.User, conf.DatabaseConfig.User,
conf.DatabaseConfig.Password, conf.DatabaseConfig.Password,
host, host,
conf.DatabaseConfig.Name, conf.DatabaseConfig.Name,
conf.DatabaseConfig.Charset)) conf.DatabaseConfig.Charset))
default: default:
util.Log().Panic("Unsupported database type %q.", confDataType) util.Log().Panic("Unsupported database type %q.", confDBType)
} }
} }
@ -89,7 +89,7 @@ func Init() {
//设置连接池 //设置连接池
db.DB().SetMaxIdleConns(50) db.DB().SetMaxIdleConns(50)
if confDataType == "sqlite" || confDataType == "UNSET" { if confDBType == "sqlite" || confDBType == "UNSET" {
db.DB().SetMaxOpenConns(1) db.DB().SetMaxOpenConns(1)
} else { } else {
db.DB().SetMaxOpenConns(100) db.DB().SetMaxOpenConns(100)

Loading…
Cancel
Save