fix database issues
This commit is contained in:
@@ -7,9 +7,10 @@ import (
|
||||
// Database database config
|
||||
type Database struct {
|
||||
Driver string
|
||||
MySQL MySQL
|
||||
Redis Redis
|
||||
PostgreSQL PostgreSQL
|
||||
MySQL *MySQL
|
||||
SQLite *SQLite
|
||||
Redis *Redis
|
||||
PostgreSQL *PostgreSQL
|
||||
}
|
||||
|
||||
// MySQL database config
|
||||
@@ -91,3 +92,14 @@ func (m *Redis) DSN() string {
|
||||
dsnTpl := "%s:%d"
|
||||
return fmt.Sprintf(dsnTpl, m.Host, m.Port)
|
||||
}
|
||||
|
||||
type SQLite struct {
|
||||
File string
|
||||
}
|
||||
|
||||
func (m *SQLite) CreateDatabaseSql() string {
|
||||
return ""
|
||||
}
|
||||
func (m *SQLite) EmptyDsn() string {
|
||||
return m.File
|
||||
}
|
||||
|
||||
33
providers/database/database.go
Normal file
33
providers/database/database.go
Normal file
@@ -0,0 +1,33 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"atom/container"
|
||||
"atom/providers/config"
|
||||
"errors"
|
||||
"log"
|
||||
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
const (
|
||||
DriverMySQL = "mysql"
|
||||
DriverSQLite = "sqlite"
|
||||
DriverPostgres = "postgres"
|
||||
DriverSQLServer = "sqlserver"
|
||||
)
|
||||
|
||||
func init() {
|
||||
if err := container.Container.Provide(NewDatabase); err != nil {
|
||||
log.Fatal(err)
|
||||
}
|
||||
}
|
||||
|
||||
func NewDatabase(config *config.Config) (*gorm.DB, error) {
|
||||
switch config.Database.Driver {
|
||||
case DriverMySQL:
|
||||
return NewMySQL(config.Database.MySQL)
|
||||
case DriverSQLite:
|
||||
return NewSQLite(config.Database.SQLite)
|
||||
}
|
||||
return nil, errors.New("failed to connect to db")
|
||||
}
|
||||
@@ -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
|
||||
|
||||
18
providers/database/sqlite.go
Normal file
18
providers/database/sqlite.go
Normal file
@@ -0,0 +1,18 @@
|
||||
package database
|
||||
|
||||
import (
|
||||
"atom/providers/config"
|
||||
|
||||
// "gorm.io/driver/sqlite"
|
||||
"github.com/glebarez/sqlite"
|
||||
"gorm.io/gorm"
|
||||
)
|
||||
|
||||
func NewSQLite(conf *config.SQLite) (*gorm.DB, error) {
|
||||
db, err := gorm.Open(sqlite.Open(conf.File), &gorm.Config{})
|
||||
if err != nil {
|
||||
return nil, err
|
||||
}
|
||||
|
||||
return db, err
|
||||
}
|
||||
Reference in New Issue
Block a user