From e6895ad95ed064877691c491f2189fe41adc95f3 Mon Sep 17 00:00:00 2001
From: shubhendra <withshubh@gmail.com>
Date: Thu, 25 Feb 2021 15:19:29 +0530
Subject: [PATCH] Clean up copied struct fields with type conversion

---
 soft_delete.go | 2 +-
 statement.go   | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/soft_delete.go b/soft_delete.go
index bdbf03c2..b16041f1 100644
--- a/soft_delete.go
+++ b/soft_delete.go
@@ -129,7 +129,7 @@ func (sd SoftDeleteDeleteClause) ModifyStatement(stmt *Statement) {
 		if _, ok := stmt.Clauses["WHERE"]; !stmt.DB.AllowGlobalUpdate && !ok {
 			stmt.DB.AddError(ErrMissingWhereClause)
 		} else {
-			SoftDeleteQueryClause{Field: sd.Field}.ModifyStatement(stmt)
+			SoftDeleteQueryClause(sd).ModifyStatement(stmt)
 		}
 
 		stmt.AddClauseIfNotExists(clause.Update{})
diff --git a/statement.go b/statement.go
index 0cb2ca32..8946bca3 100644
--- a/statement.go
+++ b/statement.go
@@ -287,7 +287,7 @@ func (stmt *Statement) BuildCondition(query interface{}, args ...interface{}) []
 				if where, ok := cs.Expression.(clause.Where); ok {
 					if len(where.Exprs) == 1 {
 						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...))