Mirrors/VILLASweb-backend-go
1
0
Fork 0
mirror of https://git.rwth-aachen.de/acs/public/villas/web-backend-go/ synced 2025-03-30 00:00:12 +01:00
Code Issues Releases Wiki Activity

pass boolean clear argument to DBInit()

Browse source
This commit is contained in:
Steffen Vogel 2021-10-19 14:40:45 +02:00
parent 515ef2de15
commit 7631e2a9b5
14 changed files with 21 additions and 21 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
database/database.go
View file

@ -38,7 +38,7 @@ import (
var DBpool *gorm.DB // database used by backend var DBpool *gorm.DB // database used by backend
// InitDB Initialize connection to the database // InitDB Initialize connection to the database
func InitDB(cfg *config.Config, dbClear string) error { func InitDB(cfg *config.Config, clear bool) error {
name, err := cfg.String("db.name") name, err := cfg.String("db.name")
if err != nil { if err != nil {
return err return err
@ -76,7 +76,7 @@ func InitDB(cfg *config.Config, dbClear string) error {
DBpool = db DBpool = db
// drop tables if parameter set // drop tables if parameter set
if dbClear == "true" { if clear {
DropTables() DropTables()
log.Println("Database tables dropped") log.Println("Database tables dropped")
} }

12
database/database_test.go
View file

@ -50,41 +50,41 @@ func TestInitDB(t *testing.T) {
ownconfig := config.NewConfig([]config.Provider{defaults, env}) ownconfig := config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.Error(t, err) assert.Error(t, err)
dbname, err := configuration.GlobalConfig.String("db.name") dbname, err := configuration.GlobalConfig.String("db.name")
assert.NoError(t, err) assert.NoError(t, err)
static["db.name"] = dbname static["db.name"] = dbname
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.Error(t, err) assert.Error(t, err)
dbhost, err := configuration.GlobalConfig.String("db.host") dbhost, err := configuration.GlobalConfig.String("db.host")
assert.NoError(t, err) assert.NoError(t, err)
static["db.host"] = dbhost static["db.host"] = dbhost
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.Error(t, err) assert.Error(t, err)
dbuser, err := configuration.GlobalConfig.String("db.user") dbuser, err := configuration.GlobalConfig.String("db.user")
assert.NoError(t, err) assert.NoError(t, err)
static["db.user"] = dbuser static["db.user"] = dbuser
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.Error(t, err) assert.Error(t, err)
dbpass, err := configuration.GlobalConfig.String("db.pass") dbpass, err := configuration.GlobalConfig.String("db.pass")
assert.NoError(t, err) assert.NoError(t, err)
static["db.pass"] = dbpass static["db.pass"] = dbpass
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.Error(t, err) assert.Error(t, err)
dbssl, err := configuration.GlobalConfig.String("db.ssl") dbssl, err := configuration.GlobalConfig.String("db.ssl")
assert.NoError(t, err) assert.NoError(t, err)
static["db.ssl"] = dbssl static["db.ssl"] = dbssl
ownconfig = config.NewConfig([]config.Provider{defaults, env}) ownconfig = config.NewConfig([]config.Provider{defaults, env})
err = InitDB(ownconfig, "true") err = InitDB(ownconfig, true)
assert.NoError(t, err) assert.NoError(t, err)
// Verify that you can connect to the database // Verify that you can connect to the database

2
routes/component-configuration/config_test.go
View file

@ -147,7 +147,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/dashboard/dashboard_test.go
View file

@ -87,7 +87,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/file/file_test.go
View file

@ -81,7 +81,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

4
routes/healthz/healthz_test.go
View file

@ -41,7 +41,7 @@ func TestHealthz(t *testing.T) {
assert.NoError(t, err) assert.NoError(t, err)
// connect DB // connect DB
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
assert.NoError(t, err) assert.NoError(t, err)
defer database.DBpool.Close() defer database.DBpool.Close()
@ -60,7 +60,7 @@ func TestHealthz(t *testing.T) {
assert.Equalf(t, 500, code, "Response body: \n%v\n", resp) assert.Equalf(t, 500, code, "Response body: \n%v\n", resp)
// reconnect DB // reconnect DB
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
assert.NoError(t, err) assert.NoError(t, err)
defer database.DBpool.Close() defer database.DBpool.Close()

2
routes/infrastructure-component/ic_test.go
View file

@ -115,7 +115,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/register_test.go
View file

@ -43,7 +43,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/result/result_test.go
View file

@ -98,7 +98,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/scenario/scenario_test.go
View file

@ -72,7 +72,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/signal/signal_test.go
View file

@ -159,7 +159,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/user/user_test.go
View file

@ -56,7 +56,7 @@ func TestMain(m *testing.M) {
if err != nil { if err != nil {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
routes/widget/widget_test.go
View file

@ -122,7 +122,7 @@ func TestMain(m *testing.M) {
panic(m) panic(m)
} }
err = database.InitDB(configuration.GlobalConfig, "true") err = database.InitDB(configuration.GlobalConfig, true)
if err != nil { if err != nil {
panic(m) panic(m)
} }

2
start.go
View file

@ -101,7 +101,7 @@ func main() {
} }
// Init database // Init database
err = database.InitDB(configuration.GlobalConfig, dbClear) err = database.InitDB(configuration.GlobalConfig, dbClear == "true")
if err != nil { if err != nil {
log.Fatalf("Error during initialization of database: %s, aborting.", err) log.Fatalf("Error during initialization of database: %s, aborting.", err)
} }