zeromicro/go-zero
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix: model unique keys generated differently in each re-generation (#1771)

Browse Source
This commit is contained in:
Kevin Wan
2022-04-09 00:25:23 +08:00
committed by GitHub
parent 0cc9d4ff8d
commit 415c4c91fc
4 changed files with 23 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
tools/goctl/model/sql/gen/insert.go
View File

@@ -2,6 +2,7 @@ package gen
import (
"fmt"
"sort"
"strings"
"github.com/zeromicro/go-zero/core/collection"
@@ -20,6 +21,10 @@ func genInsert(table Table, withCache, postgreSql bool) (string, string, error)
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
}
keys := keySet.KeysStr()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
sort.Strings(keyVars)
expressions := make([]string, 0)
expressionValues := make([]string, 0)
@@ -59,8 +64,8 @@ func genInsert(table Table, withCache, postgreSql bool) (string, string, error)
"lowerStartCamelObject": stringx.From(camel).Untitle(),
"expression": strings.Join(expressions, ", "),
"expressionValues": strings.Join(expressionValues, ", "),
"keys": strings.Join(keySet.KeysStr(), "\n"),
"keyValues": strings.Join(keyVariableSet.KeysStr(), ", "),
"keys": strings.Join(keys, "\n"),
"keyValues": strings.Join(keyVars, ", "),
"data": table,
})
if err != nil {