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

modify unscoped judge

Browse Source
This commit is contained in:
liweiting 2021-12-13 20:46:46 +08:00 committed by liweiting.wt
parent e5bdd610c3
commit 7a0ac76c9b
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
callbacks/query.go
View File

@ -27,7 +27,7 @@ func Query(db *gorm.DB) {
} }
func BuildQuerySQL(db *gorm.DB) { func BuildQuerySQL(db *gorm.DB) {
if db.Statement.Schema != nil && !db.Statement.Unscoped { if db.Statement.Schema != nil {
for _, c := range db.Statement.Schema.QueryClauses { for _, c := range db.Statement.Schema.QueryClauses {
db.Statement.AddClause(c) db.Statement.AddClause(c)
} }

2
soft_delete.go
View File

@ -63,7 +63,7 @@ func (sd SoftDeleteQueryClause) MergeClause(*clause.Clause) {
} }
func (sd SoftDeleteQueryClause) ModifyStatement(stmt *Statement) { func (sd SoftDeleteQueryClause) ModifyStatement(stmt *Statement) {
if _, ok := stmt.Clauses["soft_delete_enabled"]; !ok { if _, ok := stmt.Clauses["soft_delete_enabled"]; !ok && !stmt.Statement.Unscoped {
if c, ok := stmt.Clauses["WHERE"]; ok { if c, ok := stmt.Clauses["WHERE"]; ok {
if where, ok := c.Expression.(clause.Where); ok && len(where.Exprs) > 1 { if where, ok := c.Expression.(clause.Where); ok && len(where.Exprs) > 1 {
for _, expr := range where.Exprs { for _, expr := range where.Exprs {