From 7bdc5fa5636f9857fe096b55b0bd8149e904d2cb Mon Sep 17 00:00:00 2001 From: zijiren233 Date: Fri, 8 Dec 2023 17:50:36 +0800 Subject: [PATCH] Opt: database config name --- internal/bootstrap/db.go | 20 ++++++++++---------- internal/conf/db.go | 8 ++++---- 2 files changed, 14 insertions(+), 14 deletions(-) diff --git a/internal/bootstrap/db.go b/internal/bootstrap/db.go index 5ee01c5..5f3633e 100644 --- a/internal/bootstrap/db.go +++ b/internal/bootstrap/db.go @@ -57,7 +57,7 @@ func createDialector(dbConf conf.DatabaseConfig) (dialector gorm.Dialector, err conf.Conf.Database.User, conf.Conf.Database.Password, conf.Conf.Database.Host, - conf.Conf.Database.DBName, + conf.Conf.Database.Name, conf.Conf.Database.SslMode, ) log.Infof("mysql database unix socket: %s", conf.Conf.Database.Host) @@ -67,7 +67,7 @@ func createDialector(dbConf conf.DatabaseConfig) (dialector gorm.Dialector, err conf.Conf.Database.Password, conf.Conf.Database.Host, conf.Conf.Database.Port, - conf.Conf.Database.DBName, + conf.Conf.Database.Name, conf.Conf.Database.SslMode, ) log.Infof("mysql database tcp: %s:%d", conf.Conf.Database.Host, conf.Conf.Database.Port) @@ -83,19 +83,19 @@ func createDialector(dbConf conf.DatabaseConfig) (dialector gorm.Dialector, err case conf.DatabaseTypeSqlite3: if conf.Conf.Database.CustomDSN != "" { dsn = conf.Conf.Database.CustomDSN - } else if conf.Conf.Database.DBName == "memory" || strings.HasPrefix(conf.Conf.Database.DBName, ":memory:") { + } else if conf.Conf.Database.Name == "memory" || strings.HasPrefix(conf.Conf.Database.Name, ":memory:") { dsn = "file::memory:?cache=shared&_journal_mode=WAL&_vacuum=incremental&_pragma=foreign_keys(1)" log.Infof("sqlite3 database memory") } else { - if !strings.HasSuffix(conf.Conf.Database.DBName, ".db") { - conf.Conf.Database.DBName = conf.Conf.Database.DBName + ".db" + if !strings.HasSuffix(conf.Conf.Database.Name, ".db") { + conf.Conf.Database.Name = conf.Conf.Database.Name + ".db" } - conf.Conf.Database.DBName, err = utils.OptFilePath(conf.Conf.Database.DBName) + conf.Conf.Database.Name, err = utils.OptFilePath(conf.Conf.Database.Name) if err != nil { log.Fatalf("sqlite3 database file path error: %v", err) } - dsn = fmt.Sprintf("%s?_journal_mode=WAL&_vacuum=incremental&_pragma=foreign_keys(1)", conf.Conf.Database.DBName) - log.Infof("sqlite3 database file: %s", conf.Conf.Database.DBName) + dsn = fmt.Sprintf("%s?_journal_mode=WAL&_vacuum=incremental&_pragma=foreign_keys(1)", conf.Conf.Database.Name) + log.Infof("sqlite3 database file: %s", conf.Conf.Database.Name) } dialector = sqlite.Open(dsn) case conf.DatabaseTypePostgres: @@ -106,7 +106,7 @@ func createDialector(dbConf conf.DatabaseConfig) (dialector gorm.Dialector, err conf.Conf.Database.Host, conf.Conf.Database.User, conf.Conf.Database.Password, - conf.Conf.Database.DBName, + conf.Conf.Database.Name, conf.Conf.Database.SslMode, ) log.Infof("postgres database unix socket: %s", conf.Conf.Database.Host) @@ -116,7 +116,7 @@ func createDialector(dbConf conf.DatabaseConfig) (dialector gorm.Dialector, err conf.Conf.Database.Port, conf.Conf.Database.User, conf.Conf.Database.Password, - conf.Conf.Database.DBName, + conf.Conf.Database.Name, conf.Conf.Database.SslMode, ) log.Infof("postgres database tcp: %s:%d", conf.Conf.Database.Host, conf.Conf.Database.Port) diff --git a/internal/conf/db.go b/internal/conf/db.go index d931e12..0afee4e 100644 --- a/internal/conf/db.go +++ b/internal/conf/db.go @@ -14,7 +14,7 @@ type DatabaseConfig struct { Port uint16 `yaml:"port" env:"DATABASE_PORT"` User string `yaml:"user" env:"DATABASE_USER"` Password string `yaml:"password" env:"DATABASE_PASSWORD"` - DBName string `yaml:"db_name" lc:"default: synctv" hc:"when type is sqlite3, it will use sqlite db file or memory" env:"DATABASE_DB_NAME"` + Name string `yaml:"name" lc:"default: synctv" hc:"when type is sqlite3, it will use sqlite db file or memory" env:"DATABASE_NAME"` SslMode string `yaml:"ssl_mode" env:"DATABASE_SSL_MODE" hc:"mysql: true, false, skip-verify, preferred, postgres: disable, require, verify-ca, verify-full"` CustomDSN string `yaml:"custom_dsn" hc:"when not empty, it will ignore other config" env:"DATABASE_CUSTOM_DSN"` @@ -27,9 +27,9 @@ type DatabaseConfig struct { func DefaultDatabaseConfig() DatabaseConfig { return DatabaseConfig{ - Type: DatabaseTypeSqlite3, - Host: "", - DBName: "synctv", + Type: DatabaseTypeSqlite3, + Host: "", + Name: "synctv", MaxIdleConns: 4, MaxOpenConns: 64,