HiPoweredDev
/
xorm
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix: Get函数在赋值时未给定Table对象，无法按预期对deleted条件merge

This commit is contained in:
laoqiu 2024-04-30 16:13:30 +08:00
parent c6d05fa553
commit 43dc0fe9b5
2 changed files with 12 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
internal/statements/pk.go
View File

@ -96,3 +96,12 @@ func (statement *Statement) ProcessIDParam() error {
} }
return nil return nil
} }
func (statement *Statement) ProcessAutoCond() error {
if statement.RefTable != nil {
if col := statement.RefTable.DeletedColumn(); col != nil && !statement.GetUnscoped() { // tag "deleted" is enabled
statement.cond = statement.CondDeleted(col)
}
}
return nil
}

3
internal/statements/query.go
View File

@ -117,6 +117,9 @@ func (statement *Statement) GenGetSQL(bean interface{}) (string, []interface{},
if err := statement.ProcessIDParam(); err != nil { if err := statement.ProcessIDParam(); err != nil {
return "", nil, err return "", nil, err
} }
if err := statement.ProcessAutoCond(); err != nil {
return "", nil, err
}
} }
buf := builder.NewWriter() buf := builder.NewWriter()