modify unscoped judge (#4929)

liweitingwt · liweiting · web-flow · commit 24026bf1fedf · 2021-12-16T10:41:34.000+08:00
* modify unscoped judge

* modify unscoped judge

Co-authored-by: liweiting &lt;liweiting1995@gmail.com&gt;
diff --git a/callbacks/query.go b/callbacks/query.go
@@ -27,7 +27,7 @@ func Query(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 {
 			db.Statement.AddClause(c)
 		}
diff --git a/soft_delete.go b/soft_delete.go
@@ -63,7 +63,7 @@ func (sd SoftDeleteQueryClause) MergeClause(*clause.Clause) {
 }
 
 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 where, ok := c.Expression.(clause.Where); ok && len(where.Exprs) > 1 {
 				for _, expr := range where.Exprs {

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ func Query(db *gorm.DB) {`
`27`	`27`	`}`
`28`	`28`
`29`	`29`	`func BuildQuerySQL(db *gorm.DB) {`
`30`		`- if db.Statement.Schema != nil && !db.Statement.Unscoped {`
	`30`	`+ if db.Statement.Schema != nil {`
`31`	`31`	`for _, c := range db.Statement.Schema.QueryClauses {`
`32`	`32`	`db.Statement.AddClause(c)`
`33`	`33`	`}`
Original file line number	Diff line number	Diff line change
`@@ -63,7 +63,7 @@ func (sd SoftDeleteQueryClause) MergeClause(*clause.Clause) {`
`63`	`63`	`}`
`64`	`64`
`65`	`65`	`func (sd SoftDeleteQueryClause) ModifyStatement(stmt *Statement) {`
`66`		`- if _, ok := stmt.Clauses["soft_delete_enabled"]; !ok {`
	`66`	`+ if _, ok := stmt.Clauses["soft_delete_enabled"]; !ok && !stmt.Statement.Unscoped {`
`67`	`67`	`if c, ok := stmt.Clauses["WHERE"]; ok {`
`68`	`68`	`if where, ok := c.Expression.(clause.Where); ok && len(where.Exprs) > 1 {`
`69`	`69`	`for _, expr := range where.Exprs {`