zlei6/go-zero
1
0
Fork 0
mirror of https://github.com/zeromicro/go-zero.git synced 2026-05-07 15:10:01 +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

6
tools/goctl/model/sql/command/command.go
View File

@@ -145,14 +145,14 @@ func MySqlDataSource(_ *cobra.Command, _ []string) error {
}
func mergeColumns(columns []string) []string {
set := collection.NewSet()
set := collection.NewSet[string]()
for _, v := range columns {
fields := strings.FieldsFunc(v, func(r rune) bool {
return r == ','
})
set.AddStr(fields...)
set.Add(fields...)
}
return set.KeysStr()
return set.Keys()
}
type pattern map[string]struct{}

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, ", ")
}(),

14
tools/goctl/model/sql/parser/parser.go
View File

@@ -81,7 +81,7 @@ func Parse(filename, database string, strict bool) ([]*Table, error) {
for indexTable, e := range tables {
var (
primaryColumn string
primaryColumnSet = collection.NewSet()
primaryColumnSet = collection.NewSet[string]()
uniqueKeyMap = make(map[string][]string)
// Unused local variable
// normalKeyMap = make(map[string][]string)
@@ -91,7 +91,7 @@ func Parse(filename, database string, strict bool) ([]*Table, error) {
for _, column := range columns {
if column.Constraint != nil {
if column.Constraint.Primary {
primaryColumnSet.AddStr(column.Name)
primaryColumnSet.Add(column.Name)
}
if column.Constraint.Unique {
@@ -113,7 +113,7 @@ func Parse(filename, database string, strict bool) ([]*Table, error) {
if len(e.ColumnPrimaryKey) == 1 {
primaryColumn = e.ColumnPrimaryKey[0]
primaryColumnSet.AddStr(e.ColumnPrimaryKey[0])
primaryColumnSet.Add(e.ColumnPrimaryKey[0])
}
if len(e.ColumnUniqueKey) > 0 {
@@ -173,7 +173,7 @@ func Parse(filename, database string, strict bool) ([]*Table, error) {
func checkDuplicateUniqueIndex(uniqueIndex map[string][]*Field, tableName string) {
log := console.NewColorConsole()
uniqueSet := collection.NewSet()
uniqueSet := collection.NewSet[string]()
for k, i := range uniqueIndex {
var list []string
for _, e := range i {
@@ -187,7 +187,7 @@ func checkDuplicateUniqueIndex(uniqueIndex map[string][]*Field, tableName string
continue
}
uniqueSet.AddStr(joinRet)
uniqueSet.Add(joinRet)
}
}
@@ -311,7 +311,7 @@ func ConvertDataType(table *model.Table, strict bool) (*Table, error) {
return reply.Fields[i].OrdinalPosition < reply.Fields[j].OrdinalPosition
})
uniqueIndexSet := collection.NewSet()
uniqueIndexSet := collection.NewSet[string]()
log := console.NewColorConsole()
for indexName, each := range table.UniqueIndex {
sort.Slice(each, func(i, j int) bool {
@@ -342,7 +342,7 @@ func ConvertDataType(table *model.Table, strict bool) (*Table, error) {
continue
}
uniqueIndexSet.AddStr(uniqueKey)
uniqueIndexSet.Add(uniqueKey)
reply.UniqueIndex[indexName] = list
}