blackteay/gf
1
0
Fork 0
mirror of https://github.com/gogf/gf.git synced 2025-04-05 11:18:50 +08:00
Code Issues Projects Releases Wiki Activity

cmd/gf: fix command gf gen dao for fieldMapping feature (#3549)

Browse Source
This commit is contained in:
CyJaySong 2024-04-29 19:22:02 +08:00 committed by GitHub
parent 9aa426a105
commit 3cdd9ef36e
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cmd/gf/internal/cmd/cmd_z_unit_gen_dao_test.go
View File

@ -241,7 +241,7 @@ func Test_Gen_Dao_FieldMapping(t *testing.T) {
in = gendao.CGenDaoInput{
Path: path,
Link: link,
Tables: "table_user",
Tables: "",
TablesEx: "",
Group: group,
Prefix: "",

2
cmd/gf/internal/cmd/gendao/gendao_structure.go
View File

@ -133,7 +133,7 @@ func generateStructFieldDefinition(
}
if in.FieldMapping != nil && len(in.FieldMapping) > 0 {
if typeMapping, ok := in.FieldMapping[fmt.Sprintf("%s.%s", in.Tables, newFiledName)]; ok {
if typeMapping, ok := in.FieldMapping[fmt.Sprintf("%s.%s", in.TableName, newFiledName)]; ok {
localTypeNameStr = typeMapping.Type
appendImport = typeMapping.Import
}

2
os/gfile/gfile_replace.go
View File

@ -19,7 +19,7 @@ func ReplaceFile(search, replace, path string) error {
func ReplaceFileFunc(f func(path, content string) string, path string) error {
data := GetContents(path)
result := f(path, data)
if len(data) != len(result) && data != result {
if len(data) != len(result) || data != result {
return PutContents(path, result)
}
return nil