From 0c533b2ca6362dda7e85cdfa24b75a9087022cbf Mon Sep 17 00:00:00 2001 From: jinnrry Date: Thu, 23 Nov 2023 14:13:29 +0800 Subject: [PATCH 1/2] bug fix --- server/config/config.go | 3 +++ server/db/init.go | 6 ++++++ 2 files changed, 9 insertions(+) diff --git a/server/config/config.go b/server/config/config.go index aa9471f..dac24d2 100644 --- a/server/config/config.go +++ b/server/config/config.go @@ -91,6 +91,9 @@ func Init() { if e != nil { panic(e) } + if len(i) == 0 || strings.TrimSpace(string(i)) == "" { + return nil + } if strings.Contains(path, "data") { Instance.TablesInitData[tableName] = string(i) } else { diff --git a/server/db/init.go b/server/db/init.go index f1c557e..e58d60b 100644 --- a/server/db/init.go +++ b/server/db/init.go @@ -68,6 +68,9 @@ func checkTable() { } for tableName, createSQL := range config.Instance.Tables { + if createSQL == "" { + continue + } if _, ok := existTable[tableName]; !ok { _, err = Instance.Exec(createSQL) log.Infof("Create Table: %s", createSQL) @@ -76,6 +79,9 @@ func checkTable() { } if initData, ok := config.Instance.TablesInitData[tableName]; ok { + if initData == "" { + continue + } _, err = Instance.Exec(initData) log.Infof("Init Table: %s", initData) if err != nil { From 164c9007360699020e77e341098f74392fb67121 Mon Sep 17 00:00:00 2001 From: jinnrry Date: Thu, 23 Nov 2023 14:15:52 +0800 Subject: [PATCH 2/2] bug fix --- server/db/init.go | 13 ++++++------- 1 file changed, 6 insertions(+), 7 deletions(-) diff --git a/server/db/init.go b/server/db/init.go index e58d60b..7e665a1 100644 --- a/server/db/init.go +++ b/server/db/init.go @@ -79,13 +79,12 @@ func checkTable() { } if initData, ok := config.Instance.TablesInitData[tableName]; ok { - if initData == "" { - continue - } - _, err = Instance.Exec(initData) - log.Infof("Init Table: %s", initData) - if err != nil { - panic(err) + if initData != "" { + _, err = Instance.Exec(initData) + log.Infof("Init Table: %s", initData) + if err != nil { + panic(err) + } } }