From 6986dad2957ed57c5df0601d60ffda8940aa8627 Mon Sep 17 00:00:00 2001 From: Yang Luo Date: Tue, 25 Jul 2023 18:36:15 +0800 Subject: [PATCH] Use arg to control createDatabaseForPostgres() --- main.go | 2 +- object/adapter.go | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/main.go b/main.go index cae7ff7b..20aeda99 100644 --- a/main.go +++ b/main.go @@ -39,7 +39,7 @@ func getCreateDatabaseFlag() bool { func main() { createDatabase := getCreateDatabaseFlag() - object.InitAdapter() + object.InitAdapter(createDatabase) object.CreateTables(createDatabase) object.DoMigration() diff --git a/object/adapter.go b/object/adapter.go index 5d992fda..a79b6f12 100644 --- a/object/adapter.go +++ b/object/adapter.go @@ -42,15 +42,17 @@ func InitConfig() { beego.BConfig.WebConfig.Session.SessionOn = true - InitAdapter() + InitAdapter(true) CreateTables(true) DoMigration() } -func InitAdapter() { - err := createDatabaseForPostgres(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName")) - if err != nil { - panic(err) +func InitAdapter(createDatabase bool) { + if createDatabase { + err := createDatabaseForPostgres(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName")) + if err != nil { + panic(err) + } } adapter = NewAdapter(conf.GetConfigString("driverName"), conf.GetConfigDataSourceName(), conf.GetConfigString("dbName"))