Kiu/Semaphore
Kiu/Semaphore
1
0
Fork 0
mirror of https://github.com/semaphoreui/semaphore.git synced 2025-01-20 15:29:28 +01:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

refactor(config): remove type DbDriver

Browse Source
This commit is contained in:
Denis Gukov 2023-09-14 19:55:09 +02:00
parent 39c6cdaad9
commit 0b3394c29d
3 changed files with 10 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
db/sql/SqlDb.go
View File

@ -150,7 +150,7 @@ func connect() (*sql.DB, error) {
return nil, err
}
dialect := cfg.Dialect.String()
dialect := cfg.Dialect
return sql.Open(dialect, connectionString)
}
@ -169,7 +169,7 @@ func createDb() error {
return err
}
conn, err := sql.Open(cfg.Dialect.String(), connectionString)
conn, err := sql.Open(cfg.Dialect, connectionString)
if err != nil {
return err
}

21
util/config.go
View File

@ -27,16 +27,14 @@ var Cookie *securecookie.SecureCookie
// WebHostURL is the public route to the semaphore server
var WebHostURL *url.URL
type DbDriver string
const (
DbDriverMySQL DbDriver = "mysql"
DbDriverBolt DbDriver = "bolt"
DbDriverPostgres DbDriver = "postgres"
DbDriverMySQL = "mysql"
DbDriverBolt = "bolt"
DbDriverPostgres = "postgres"
)
type DbConfig struct {
Dialect DbDriver `json:"-"`
Dialect string `json:"-"`
Hostname string `json:"host" env:"SEMAPHORE_DB_HOST"`
Username string `json:"user" env:"SEMAPHORE_DB_USER"`
@ -108,7 +106,7 @@ type ConfigType struct {
BoltDb DbConfig `json:"bolt"`
Postgres DbConfig `json:"postgres"`
Dialect DbDriver `json:"dialect" rule:"^mysql|bolt|postgres$" env:"SEMAPHORE_DB_DIALECT"`
Dialect string `json:"dialect" rule:"^mysql|bolt|postgres$" env:"SEMAPHORE_DB_DIALECT"`
// Format `:port_num` eg, :3000
// if : is missing it will be corrected
@ -510,11 +508,6 @@ func CheckUpdate() (updateAvailable *github.RepositoryRelease, err error) {
return
}
// String returns dialect name for GORP.
func (d DbDriver) String() string {
return string(d)
}
func (d *DbConfig) IsPresent() bool {
return d.GetHostname() != ""
}
@ -626,7 +619,7 @@ func (conf *ConfigType) PrintDbInfo() {
}
}
func (conf *ConfigType) GetDialect() (dialect DbDriver, err error) {
func (conf *ConfigType) GetDialect() (dialect string, err error) {
if conf.Dialect == "" {
switch {
case conf.MySQL.IsPresent():
@ -646,7 +639,7 @@ func (conf *ConfigType) GetDialect() (dialect DbDriver, err error) {
}
func (conf *ConfigType) GetDBConfig() (dbConfig DbConfig, err error) {
var dialect DbDriver
var dialect string
dialect, err = conf.GetDialect()
if err != nil {

2
util/config_test.go
View File

@ -294,7 +294,7 @@ func TestValidateConfig(t *testing.T) {
Config = new(ConfigType)
var testPort string = ":3000"
var testDbDialect DbDriver = DbDriverBolt
var testDbDialect = DbDriverBolt
var testCookieHash string = "0Sn+edH3doJ4EO4Rl49Y0KrxjUkXuVtR5zKHGGWerxQ="
var testMaxParallelTasks int = 0