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

fix database issues

Browse Source
This commit is contained in:
rogee
2023-02-07 00:14:30 +08:00
parent 47e8139f47
commit 032cfbc283
10 changed files with 129 additions and 102 deletions
Download Patch File Download Diff File Expand all files Collapse all files

36
providers/database/mysql.go
View File

@@ -1,38 +1,30 @@
package mysql
package database
import (
"atom/container"
"atom/providers/config"
"database/sql"
"fmt"
"log"
"gorm.io/driver/mysql"
"gorm.io/gorm"
"gorm.io/gorm/schema"
)
func init() {
if err := container.Container.Provide(NewDatabase); err != nil {
log.Fatal(err)
}
}
func NewDatabase(config *config.Config) (*gorm.DB, error) {
if err := createDatabase(config.Database.MySQL.EmptyDsn(), "mysql", config.Database.MySQL.CreateDatabaseSql()); err != nil {
func NewMySQL(conf *config.MySQL) (*gorm.DB, error) {
if err := createMySQLDatabase(conf.EmptyDsn(), "mysql", conf.CreateDatabaseSql()); err != nil {
return nil, err
}
mysqlConfig := mysql.Config{
DSN: config.Database.MySQL.DSN(), // DSN data source name
DefaultStringSize: 191, // string 类型字段的默认长度
SkipInitializeWithVersion: false, // 根据版本自动配置
DSN: conf.DSN(), // DSN data source name
DefaultStringSize: 191, // string 类型字段的默认长度
SkipInitializeWithVersion: false, // 根据版本自动配置
}
gormConfig := gorm.Config{
NamingStrategy: schema.NamingStrategy{
TablePrefix: config.Database.MySQL.Prefix,
SingularTable: config.Database.MySQL.Singular,
TablePrefix: conf.Prefix,
SingularTable: conf.Singular,
},
DisableForeignKeyConstraintWhenMigrating: true,
}
@@ -43,7 +35,7 @@ func NewDatabase(config *config.Config) (*gorm.DB, error) {
// LogLevel: logger.Warn,
// Colorful: true,
// })
// config.Logger = _default.LogMode(logger.Warn)
// conf.Logger = _default.LogMode(logger.Warn)
db, err := gorm.Open(mysql.New(mysqlConfig), &gormConfig)
if err != nil {
@@ -51,17 +43,17 @@ func NewDatabase(config *config.Config) (*gorm.DB, error) {
}
// config instance
db.InstanceSet("gorm:table_options", "ENGINE="+config.Database.MySQL.Engine)
db.InstanceSet("gorm:table_options", "ENGINE="+conf.Engine)
sqlDB, _ := db.DB()
sqlDB.SetMaxIdleConns(config.Database.MySQL.MaxIdleConns)
sqlDB.SetMaxOpenConns(config.Database.MySQL.MaxOpenConns)
sqlDB.SetMaxIdleConns(conf.MaxIdleConns)
sqlDB.SetMaxOpenConns(conf.MaxOpenConns)
return db, err
}
// createDatabase 创建数据库（ EnsureDB() 中调用 ）
func createDatabase(dsn string, driver string, createSql string) error {
// createDatabase 创建数据库
func createMySQLDatabase(dsn string, driver string, createSql string) error {
db, err := sql.Open(driver, dsn)
if err != nil {
return err