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

Clean up copied struct fields with type conversion

Browse Source
This commit is contained in:
shubhendra 2021-02-25 15:19:29 +05:30
parent ba69820281
commit e6895ad95e
No known key found for this signature in database
GPG Key ID: 9AFEF5C98D542137
2 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
soft_delete.go
View File

@ -129,7 +129,7 @@ func (sd SoftDeleteDeleteClause) ModifyStatement(stmt *Statement) {
if _, ok := stmt.Clauses["WHERE"]; !stmt.DB.AllowGlobalUpdate && !ok { if _, ok := stmt.Clauses["WHERE"]; !stmt.DB.AllowGlobalUpdate && !ok {
stmt.DB.AddError(ErrMissingWhereClause) stmt.DB.AddError(ErrMissingWhereClause)
} else { } else {
SoftDeleteQueryClause{Field: sd.Field}.ModifyStatement(stmt) SoftDeleteQueryClause(sd).ModifyStatement(stmt)
} }
stmt.AddClauseIfNotExists(clause.Update{}) stmt.AddClauseIfNotExists(clause.Update{})

2
statement.go
View File

@ -287,7 +287,7 @@ func (stmt *Statement) BuildCondition(query interface{}, args ...interface{}) []
if where, ok := cs.Expression.(clause.Where); ok { if where, ok := cs.Expression.(clause.Where); ok {
if len(where.Exprs) == 1 { if len(where.Exprs) == 1 {
if orConds, ok := where.Exprs[0].(clause.OrConditions); ok { if orConds, ok := where.Exprs[0].(clause.OrConditions); ok {
where.Exprs[0] = clause.AndConditions{Exprs: orConds.Exprs} where.Exprs[0] = clause.AndConditions(orConds)
} }
} }
conds = append(conds, clause.And(where.Exprs...)) conds = append(conds, clause.And(where.Exprs...))