diff --git a/internal/setup/sql.go b/internal/setup/sql.go index 351b0453..ebac8928 100644 --- a/internal/setup/sql.go +++ b/internal/setup/sql.go @@ -2,16 +2,7 @@ package setup import ( _ "embed" - "encoding/json" - "github.com/iwind/TeaGo/logs" ) //go:embed sql.json var sqlData []byte - -func init() { - err := json.Unmarshal(sqlData, LatestSQLResult) - if err != nil { - logs.Println("[ERROR]load sql failed: " + err.Error()) - } -} diff --git a/internal/setup/sql_executor.go b/internal/setup/sql_executor.go index 6bcf7953..aed33bd8 100644 --- a/internal/setup/sql_executor.go +++ b/internal/setup/sql_executor.go @@ -18,8 +18,6 @@ import ( "time" ) -var LatestSQLResult = &SQLDumpResult{} - // SQLExecutor 安装或升级SQL执行器 type SQLExecutor struct { dbConfig *dbs.DBConfig @@ -65,7 +63,14 @@ func (this *SQLExecutor) Run(showLog bool) error { if this.logWriter != nil { showLog = true } - _, err = sqlDump.Apply(db, LatestSQLResult, showLog) + + var sqlResult = &SQLDumpResult{} + err = json.Unmarshal(sqlData, sqlResult) + if err != nil { + return errors.New("decode sql data failed: " + err.Error()) + } + + _, err = sqlDump.Apply(db, sqlResult, showLog) if err != nil { return err }