增加SQL子版本

internal/const/const.go

@@ -24,4 +24,7 @@ const (
 	MonitorNodeVersion   = "0.0.3"
 	DNSNodeVersion       = "0.2.1"
 	ReportNodeVersion    = "0.1.0"
+
+	// SQLVersion SQL版本号
+	SQLVersion = "1"
 )

internal/nodes/api_node.go

@@ -276,7 +276,7 @@ func (this *APINode) autoUpgrade() error {
 	if err != nil {
 		return errors.New("decode database config failed: " + err.Error())
 	}
-	dbConfig := config.DBs[Tea.Env]
+	var dbConfig = config.DBs[Tea.Env]
 	db, err := dbs.NewInstanceFromConfig(dbConfig)
 	if err != nil {
 		return errors.New("load database failed: " + err.Error())
@@ -287,8 +287,8 @@ func (this *APINode) autoUpgrade() error {
 	}
 	if one != nil {
 		// 如果是同样的版本，则直接认为是最新版本
-		version := one.GetString("version")
+		var version = one.GetString("version")
-		if stringutil.VersionCompare(version, teaconst.Version) >= 0 {
+		if stringutil.VersionCompare(version, setup.ComposeSQLVersion()) >= 0 {
 			return nil
 		}
 	}

internal/setup/sql_executor.go

@@ -2,7 +2,6 @@ package setup
 
 import (
 	"encoding/json"
-	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
 	"github.com/TeaOSLab/EdgeAPI/internal/db/models"
 	"github.com/TeaOSLab/EdgeAPI/internal/errors"
 	"github.com/TeaOSLab/EdgeCommon/pkg/dnsconfigs"
@@ -113,7 +112,7 @@ func (this *SQLExecutor) checkData(db *dbs.DB) error {
 	}
 
 	// 更新版本号
-	err = this.updateVersion(db, teaconst.Version)
+	err = this.updateVersion(db, ComposeSQLVersion())
 	if err != nil {
 		return err
 	}

internal/setup/utils.go

@@ -0,0 +1,20 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package setup
+
+import (
+	teaconst "github.com/TeaOSLab/EdgeAPI/internal/const"
+	"strings"
+)
+
+func ComposeSQLVersion() string {
+	var version = teaconst.Version
+	if len(teaconst.SQLVersion) == 0 {
+		return version
+	}
+
+	if strings.Count(version, ".") <= 2 {
+		return version + "." + teaconst.SQLVersion
+	}
+	return version
+}

internal/setup/utils_test.go

@@ -0,0 +1,12 @@
+// Copyright 2022 Liuxiangchao iwind.liu@gmail.com. All rights reserved.
+
+package setup_test
+
+import (
+	"github.com/TeaOSLab/EdgeAPI/internal/setup"
+	"testing"
+)
+
+func TestComposeSQLVersion(t *testing.T) {
+	t.Log(setup.ComposeSQLVersion())
+}