Use driver constants in app.go
This commit is contained in:
parent
3722c6ba79
commit
a58a756746
8
app.go
8
app.go
|
@ -269,7 +269,7 @@ func Serve() {
|
||||||
defer shutdown(app)
|
defer shutdown(app)
|
||||||
|
|
||||||
schemaFileName := "schema.sql"
|
schemaFileName := "schema.sql"
|
||||||
if app.cfg.Database.Type == "sqlite3" {
|
if app.cfg.Database.Type == driverSQLite {
|
||||||
schemaFileName = "sqlite.sql"
|
schemaFileName = "sqlite.sql"
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -370,7 +370,7 @@ func Serve() {
|
||||||
app.formDecoder.RegisterConverter(sql.NullFloat64{}, converter.ConvertSQLNullFloat64)
|
app.formDecoder.RegisterConverter(sql.NullFloat64{}, converter.ConvertSQLNullFloat64)
|
||||||
|
|
||||||
// Check database configuration
|
// Check database configuration
|
||||||
if app.cfg.Database.Type == "mysql" && (app.cfg.Database.User == "" || app.cfg.Database.Password == "") {
|
if app.cfg.Database.Type == driverMySQL && (app.cfg.Database.User == "" || app.cfg.Database.Password == "") {
|
||||||
log.Error("Database user or password not set.")
|
log.Error("Database user or password not set.")
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
}
|
}
|
||||||
|
@ -471,10 +471,10 @@ func connectToDatabase(app *app) {
|
||||||
|
|
||||||
var db *sql.DB
|
var db *sql.DB
|
||||||
var err error
|
var err error
|
||||||
if app.cfg.Database.Type == "mysql" {
|
if app.cfg.Database.Type == driverMySQL {
|
||||||
db, err = sql.Open(app.cfg.Database.Type, fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=%s", app.cfg.Database.User, app.cfg.Database.Password, app.cfg.Database.Host, app.cfg.Database.Port, app.cfg.Database.Database, url.QueryEscape(time.Local.String())))
|
db, err = sql.Open(app.cfg.Database.Type, fmt.Sprintf("%s:%s@tcp(%s:%d)/%s?charset=utf8mb4&parseTime=true&loc=%s", app.cfg.Database.User, app.cfg.Database.Password, app.cfg.Database.Host, app.cfg.Database.Port, app.cfg.Database.Database, url.QueryEscape(time.Local.String())))
|
||||||
db.SetMaxOpenConns(50)
|
db.SetMaxOpenConns(50)
|
||||||
} else if app.cfg.Database.Type == "sqlite3" {
|
} else if app.cfg.Database.Type == driverSQLite {
|
||||||
if !SQLiteEnabled {
|
if !SQLiteEnabled {
|
||||||
log.Error("Invalid database type '%s'. Binary wasn't compiled with SQLite3 support.", app.cfg.Database.Type)
|
log.Error("Invalid database type '%s'. Binary wasn't compiled with SQLite3 support.", app.cfg.Database.Type)
|
||||||
os.Exit(1)
|
os.Exit(1)
|
||||||
|
|
Loading…
Reference in New Issue