From 00691871fbffa1d5cc20335f86a85dbe2df6d681 Mon Sep 17 00:00:00 2001
From: GoEdgeLab <goedgecloud@gmail.com>
Date: Mon, 10 Apr 2023 20:57:38 +0800
Subject: [PATCH] =?UTF-8?q?=E4=BC=98=E5=8C=96=E5=90=AF=E5=8A=A8=E9=80=9F?=
 =?UTF-8?q?=E5=BA=A6?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 internal/setup/sql.go          |  9 ---------
 internal/setup/sql_executor.go | 11 ++++++++---
 2 files changed, 8 insertions(+), 12 deletions(-)

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
 	}