tablet/gorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

fix: Omit 'model' and 'model.*' should be same

Browse Source
This commit is contained in:
chenrui 2022-03-07 16:44:47 +08:00
parent b566ed7913
commit 0c968b24a8
2 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
statement.go
View File

@ -674,6 +674,7 @@ func (stmt *Statement) SelectAndOmitColumns(requireCreate, requireUpdate bool) (
// omit columns // omit columns
for _, omit := range stmt.Omits { for _, omit := range stmt.Omits {
omit = strings.TrimSuffix(omit, ".*")
if stmt.Schema == nil { if stmt.Schema == nil {
results[omit] = false results[omit] = false
} else if omit == "*" { } else if omit == "*" {

2
tests/create_test.go
View File

@ -446,7 +446,7 @@ func TestSelectWithCreate(t *testing.T) {
func TestOmitWithCreate(t *testing.T) { func TestOmitWithCreate(t *testing.T) {
user := *GetUser("omit_create", Config{Account: true, Pets: 3, Toys: 3, Company: true, Manager: true, Team: 3, Languages: 3, Friends: 4}) user := *GetUser("omit_create", Config{Account: true, Pets: 3, Toys: 3, Company: true, Manager: true, Team: 3, Languages: 3, Friends: 4})
DB.Omit("Account", "Toys", "Manager", "Birthday").Create(&user) DB.Omit("Account.*", "Toys", "Manager", "Birthday").Create(&user)
var result User var result User
DB.Preload("Account").Preload("Pets").Preload("Toys").Preload("Company").Preload("Manager").Preload("Team").Preload("Languages").Preload("Friends").First(&result, user.ID) DB.Preload("Account").Preload("Pets").Preload("Toys").Preload("Company").Preload("Manager").Preload("Team").Preload("Languages").Preload("Friends").First(&result, user.ID)