fix: fi remove sort tag

things-go · Jul 16, 2023 · a3de779 · a3de779
1 parent d509d3a
commit a3de779
Show file tree

Hide file tree

Showing 4 changed files with 32 additions and 13 deletions.
diff --git a/driver/mysql/def.go b/driver/mysql/def.go
@@ -134,12 +134,8 @@ func (c *Column) IntoOrmTag(indexes []*Index, keyNameCount map[string]int) strin
 			b.WriteString("uniqueIndex:")
 			b.WriteString(v.KeyName)
 		} else {
-			if v.KeyName == "sort" { // 兼容 gorm 本身 sort 标签
-				b.WriteString("index")
-			} else {
-				b.WriteString("index:")
-				b.WriteString(v.KeyName)
-			}
+			b.WriteString("index:")
+			b.WriteString(v.KeyName)
 			if v.IndexType == "FULLTEXT" {
 				b.WriteString(",class:FULLTEXT")
 			}

diff --git a/internal/sts/sts.go b/internal/sts/sts.go
@@ -59,7 +59,6 @@ func Parse(v any) error {
 		fmt.Println(fv.Name)
 		fmt.Println(fvt.Kind())
 		fmt.Printf("%#v\n", field.Build(nil))
-
 	}
 
 	return nil

diff --git a/schema/column.go b/schema/column.go
@@ -70,12 +70,8 @@ func (c *Column) IntoOrmTag() string {
 			b.WriteString("uniqueIndex:")
 			b.WriteString(v.KeyName)
 		} else {
-			if v.KeyName == "sort" { // 兼容 gorm 本身 sort 标签
-				b.WriteString("index")
-			} else {
-				b.WriteString("index:")
-				b.WriteString(v.KeyName)
-			}
+			b.WriteString("index:")
+			b.WriteString(v.KeyName)
 			if v.IndexType == "FULLTEXT" {
 				b.WriteString(",class:FULLTEXT")
 			}

diff --git a/schema/index.go b/schema/index.go
@@ -1,5 +1,10 @@
 package schema
 
+import (
+	"fmt"
+	"strings"
+)
+
 type Index struct {
 	Table       string
 	KeyName     string
@@ -10,3 +15,26 @@ type Index struct {
 	IndexType   string
 	Columns     []string
 }
+
+func (self *Index) IntoMysqlString() string {
+	b := strings.Builder{}
+	b.Grow(32)
+	if !self.Unique {
+		b.WriteString("KEY")
+	} else {
+		if self.PrimaryKey {
+			b.WriteString("PRIMARY KEY")
+		} else {
+			b.WriteString("UNIQUE KEY")
+		}
+	}
+	if !self.PrimaryKey {
+		b.WriteString(" ")
+		b.WriteString(fmt.Sprintf("`%s`", self.KeyName))
+	}
+	b.WriteString(" (`")
+	b.WriteString(strings.Join(self.Columns, "`, `"))
+	b.WriteString("`) USING ")
+	b.WriteString(self.IndexType)
+	return b.String()
+}