re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix Omit/Select without Model value, close #4098

This commit is contained in:
Jinzhu 2021-02-18 10:53:29 +08:00
parent 73d44a4f97
commit 79225bfe48
1 changed files with 9 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
statement.go
View File

@ -600,12 +600,14 @@ func (stmt *Statement) SelectAndOmitColumns(requireCreate, requireUpdate bool) (
// select columns // select columns
for _, column := range stmt.Selects { for _, column := range stmt.Selects {
if column == "*" { if stmt.Schema == nil {
results[column] = true
} else if column == "*" {
notRestricted = true notRestricted = true
for _, dbName := range stmt.Schema.DBNames { for _, dbName := range stmt.Schema.DBNames {
results[dbName] = true results[dbName] = true
} }
} else if column == clause.Associations && stmt.Schema != nil { } else if column == clause.Associations {
for _, rel := range stmt.Schema.Relationships.Relations { for _, rel := range stmt.Schema.Relationships.Relations {
results[rel.Name] = true results[rel.Name] = true
} }
@ -618,11 +620,11 @@ func (stmt *Statement) SelectAndOmitColumns(requireCreate, requireUpdate bool) (
// omit columns // omit columns
for _, omit := range stmt.Omits { for _, omit := range stmt.Omits {
if omit == clause.Associations { if stmt.Schema == nil {
if stmt.Schema != nil { results[omit] = false
for _, rel := range stmt.Schema.Relationships.Relations { } else if omit == clause.Associations {
results[rel.Name] = false for _, rel := range stmt.Schema.Relationships.Relations {
} results[rel.Name] = false
} }
} else if field := stmt.Schema.LookUpField(omit); field != nil && field.DBName != "" { } else if field := stmt.Schema.LookUpField(omit); field != nil && field.DBName != "" {
results[field.DBName] = false results[field.DBName] = false