From db45aa596f9851656b5f6ad1614bc18bf5aaec97 Mon Sep 17 00:00:00 2001 From: Samuel Prasetya Date: Wed, 11 Jan 2017 18:40:33 +0700 Subject: [PATCH] tahem --- scope.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/scope.go b/scope.go index 0a3d6e6f..67ac805c 100644 --- a/scope.go +++ b/scope.go @@ -677,7 +677,7 @@ func (scope *Scope) whereSQL() (sql string) { ) if !scope.Search.Unscoped && scope.HasColumn("deleted_at") { - sql := fmt.Sprintf("%v.deleted_at IS NULL", quotedTableName) + sql := fmt.Sprintf("(%v.deleted_at IS NULL OR %v.deleted_at = '0000-00-00 00:00:00')", quotedTableName, quotedTableName) primaryConditions = append(primaryConditions, sql) }