zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-10 08:29:58 +08:00
Code Issues Packages Projects Releases Wiki Activity

chore: update go-zero version (#5093)

Browse Source 
Signed-off-by: kevin <wanjunfeng@gmail.com>
This commit is contained in:
Kevin Wan
2025-08-17 17:00:15 +08:00
committed by GitHub
parent a5d42e20d5
commit a81d898408
16 changed files with 99 additions and 107 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/goctl/model/sql/gen/customized.go
View File

@@ -60,17 +60,17 @@ func genCustomized(table Table, withCache, postgreSql bool) (string, error) {
fields = append(fields, f)
}
keySet := collection.NewSet()
keyVariableSet := collection.NewSet()
keySet.AddStr(table.PrimaryCacheKey.KeyExpression)
keyVariableSet.AddStr(table.PrimaryCacheKey.KeyLeft)
keySet := collection.NewSet[string]()
keyVariableSet := collection.NewSet[string]()
keySet.Add(table.PrimaryCacheKey.KeyExpression)
keyVariableSet.Add(table.PrimaryCacheKey.KeyLeft)
for _, key := range table.UniqueCacheKey {
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
keySet.Add(key.DataKeyExpression)
keyVariableSet.Add(key.KeyLeft)
}
keys := keySet.KeysStr()
keys := keySet.Keys()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
keyVars := keyVariableSet.Keys()
sort.Strings(keyVars)
camel := table.Name.ToCamel()

16
tools/goctl/model/sql/gen/delete.go
View File

@@ -12,17 +12,17 @@ import (
)
func genDelete(table Table, withCache, postgreSql bool) (string, string, error) {
keySet := collection.NewSet()
keyVariableSet := collection.NewSet()
keySet.AddStr(table.PrimaryCacheKey.KeyExpression)
keyVariableSet.AddStr(table.PrimaryCacheKey.KeyLeft)
keySet := collection.NewSet[string]()
keyVariableSet := collection.NewSet[string]()
keySet.Add(table.PrimaryCacheKey.KeyExpression)
keyVariableSet.Add(table.PrimaryCacheKey.KeyLeft)
for _, key := range table.UniqueCacheKey {
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
keySet.Add(key.DataKeyExpression)
keyVariableSet.Add(key.KeyLeft)
}
keys := keySet.KeysStr()
keys := keySet.Keys()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
keyVars := keyVariableSet.Keys()
sort.Strings(keyVars)
camel := table.Name.ToCamel()

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

@@ -13,17 +13,17 @@ import (
)
func genInsert(table Table, withCache, postgreSql bool) (string, string, error) {
keySet := collection.NewSet()
keyVariableSet := collection.NewSet()
keySet.AddStr(table.PrimaryCacheKey.DataKeyExpression)
keyVariableSet.AddStr(table.PrimaryCacheKey.KeyLeft)
keySet := collection.NewSet[string]()
keyVariableSet := collection.NewSet[string]()
keySet.Add(table.PrimaryCacheKey.DataKeyExpression)
keyVariableSet.Add(table.PrimaryCacheKey.KeyLeft)
for _, key := range table.UniqueCacheKey {
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
keySet.Add(key.DataKeyExpression)
keyVariableSet.Add(key.KeyLeft)
}
keys := keySet.KeysStr()
keys := keySet.Keys()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
keyVars := keyVariableSet.Keys()
sort.Strings(keyVars)
expressions := make([]string, 0)

16
tools/goctl/model/sql/gen/update.go
View File

@@ -32,17 +32,17 @@ func genUpdate(table Table, withCache, postgreSql bool) (
expressionValues = append(expressionValues, pkg+camel)
}
keySet := collection.NewSet()
keyVariableSet := collection.NewSet()
keySet.AddStr(table.PrimaryCacheKey.DataKeyExpression)
keyVariableSet.AddStr(table.PrimaryCacheKey.KeyLeft)
keySet := collection.NewSet[string]()
keyVariableSet := collection.NewSet[string]()
keySet.Add(table.PrimaryCacheKey.DataKeyExpression)
keyVariableSet.Add(table.PrimaryCacheKey.KeyLeft)
for _, key := range table.UniqueCacheKey {
keySet.AddStr(key.DataKeyExpression)
keyVariableSet.AddStr(key.KeyLeft)
keySet.Add(key.DataKeyExpression)
keyVariableSet.Add(key.KeyLeft)
}
keys := keySet.KeysStr()
keys := keySet.Keys()
sort.Strings(keys)
keyVars := keyVariableSet.KeysStr()
keyVars := keyVariableSet.Keys()
sort.Strings(keyVars)
if postgreSql {

8
tools/goctl/model/sql/gen/vars.go
View File

@@ -36,15 +36,15 @@ func genVars(table Table, withCache, postgreSql bool) (string, error) {
"postgreSql": postgreSql,
"data": table,
"ignoreColumns": func() string {
var set = collection.NewSet()
var set = collection.NewSet[string]()
for _, c := range table.ignoreColumns {
if postgreSql {
set.AddStr(fmt.Sprintf(`"%s"`, c))
set.Add(fmt.Sprintf(`"%s"`, c))
} else {
set.AddStr(fmt.Sprintf("\"`%s`\"", c))
set.Add(fmt.Sprintf("\"`%s`\"", c))
}
}
list := set.KeysStr()
list := set.Keys()
sort.Strings(list)
return strings.Join(list, ", ")
}(),