create table fix

Author: folospace

orm/create_struct.go

@@ -8,6 +8,7 @@ import (
     "reflect"
     "regexp"
     "runtime"
+    "strconv"
     "strings"
     "time"
 )
@@ -188,16 +189,16 @@ func getTableDbColumns[T Table](query *Query[T]) ([]dBColumn, error) {
             keyName := strings.Trim(keyNameAndCols[0], "`")
             cols := strings.Split(strings.Trim(keyNameAndCols[1], "()"), ",")
 
-            if len(cols) == 1 {
-                colName := strings.Trim(cols[0], "`")
-                ret[existColumn[colName]].Unique = true
-            } else {
-                if strings.HasPrefix(keyName, "unique_") == false {
-                    keyName = "unique_" + keyName
-                }
-                for _, v2 := range cols {
-                    colName := strings.Trim(v2, "`")
-
+            if len(cols) == 1 && cols[0] == keyNameAndCols[0] {
+                keyName = "unique"
+            } else if strings.HasPrefix(keyName, "unique_") == false {
+                keyName = "unique_" + keyName
+            }
+            for k2, v2 := range cols {
+                colName := strings.Trim(v2, "`")
+                if len(cols) > 1 {
+                    ret[existColumn[colName]].Uniques = append(ret[existColumn[colName]].Uniques, keyName+"("+strconv.Itoa(k2)+")")
+                } else {
                     ret[existColumn[colName]].Uniques = append(ret[existColumn[colName]].Uniques, keyName)
                 }
             }
@@ -211,16 +212,17 @@ func getTableDbColumns[T Table](query *Query[T]) ([]dBColumn, error) {
             keyName := strings.Trim(keyNameAndCols[0], "`")
             cols := strings.Split(strings.Trim(keyNameAndCols[1], "()"), ",")
 
-            if len(cols) == 1 {
-                colName := strings.Trim(cols[0], "`")
-                ret[existColumn[colName]].Index = true
-            } else {
-                if strings.HasPrefix(keyName, "index_") == false {
-                    keyName = "index_" + keyName
-                }
-                for _, v2 := range cols {
-                    colName := strings.Trim(v2, "`")
+            if len(cols) == 1 && cols[0] == keyNameAndCols[0] {
+                keyName = "index"
+            } else if strings.HasPrefix(keyName, "index_") == false {
+                keyName = "index_" + keyName
+            }
+            for k2, v2 := range cols {
+                colName := strings.Trim(v2, "`")
 
+                if len(cols) > 1 {
+                    ret[existColumn[colName]].Indexs = append(ret[existColumn[colName]].Indexs, keyName+"("+strconv.Itoa(k2)+")")
+                } else {
                     ret[existColumn[colName]].Indexs = append(ret[existColumn[colName]].Indexs, keyName)
                 }
             }

orm/create_table.go

@@ -3,7 +3,7 @@ package orm
 import (
     "fmt"
     "reflect"
-    "sort"
+    "strconv"
     "strings"
     "time"
 )
@@ -159,12 +159,41 @@ func generateColumnStrings(dbColums []dBColumn) []string {
 
         if len(v.Uniques) > 0 {
             for _, v2 := range v.Uniques {
+                if strings.HasSuffix(v2, ")") {
+                    li := strings.LastIndex(v2, "(")
+                    if li > 0 {
+                        numStr := v2[li+1 : len(v2)-1]
+                        num, numErr := strconv.Atoi(numStr)
+                        if numErr == nil {
+                            if uniqueComps[v2[:li]] == nil {
+                                uniqueComps[v2[:li]] = make([]string, 16)
+                            }
+                            uniqueComps[v2[:li]][num] = v.Name
+                            continue
+                        }
+                    }
+                }
                 uniqueComps[v2] = append(uniqueComps[v2], v.Name)
+
             }
         }
 
         if len(v.Indexs) > 0 {
             for _, v2 := range v.Indexs {
+                if strings.HasSuffix(v2, ")") {
+                    li := strings.LastIndex(v2, "(")
+                    if li > 0 {
+                        numStr := v2[li+1 : len(v2)-1]
+                        num, numErr := strconv.Atoi(numStr)
+                        if numErr == nil {
+                            if indexComps[v2[:li]] == nil {
+                                indexComps[v2[:li]] = make([]string, 16)
+                            }
+                            indexComps[v2[:li]][num] = v.Name
+                            continue
+                        }
+                    }
+                }
                 indexComps[v2] = append(indexComps[v2], v.Name)
             }
         }
@@ -181,16 +210,22 @@ func generateColumnStrings(dbColums []dBColumn) []string {
         ret = append(ret, v)
     }
     for k, v := range uniqueComps {
-        sort.SliceStable(v, func(i, j int) bool {
-            return strings.Index(k, v[i]) < strings.Index(k, v[j])
-        })
-        ret = append(ret, fmt.Sprintf("unique key `%s` (%s)", k, "`"+strings.Join(v, "`,`")+"`"))
+        var newv []string
+        for _, v2 := range v {
+            if v2 != "" {
+                newv = append(newv, v2)
+            }
+        }
+        ret = append(ret, fmt.Sprintf("unique key `%s` (%s)", k, "`"+strings.Join(newv, "`,`")+"`"))
     }
     for k, v := range indexComps {
-        sort.SliceStable(v, func(i, j int) bool {
-            return strings.Index(k, v[i]) < strings.Index(k, v[j])
-        })
-        ret = append(ret, fmt.Sprintf("key `%s` (%s)", k, "`"+strings.Join(v, "`,`")+"`"))
+        var newv []string
+        for _, v2 := range v {
+            if v2 != "" {
+                newv = append(newv, v2)
+            }
+        }
+        ret = append(ret, fmt.Sprintf("key `%s` (%s)", k, "`"+strings.Join(newv, "`,`")+"`"))
     }
     return ret
 }