From fef286a7bccc00174f51522e8c292ec6443a0a89 Mon Sep 17 00:00:00 2001 From: Andrew Brampton Date: Sun, 11 Jan 2015 13:49:36 -0800 Subject: [PATCH] Fixes #335 - Added scoped table name to "deleted_at" where clause. This ensures it works when the deleted_at column is ambigious, for example, during a join. --- scope_private.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/scope_private.go b/scope_private.go index 4d93e7ba..a48f443b 100644 --- a/scope_private.go +++ b/scope_private.go @@ -168,7 +168,8 @@ func (scope *Scope) whereSql() (sql string) { var primaryCondiations, andConditions, orConditions []string if !scope.Search.Unscope && scope.HasColumn("DeletedAt") { - primaryCondiations = append(primaryCondiations, "(deleted_at IS NULL OR deleted_at <= '0001-01-02')") + sql := fmt.Sprintf("(%v.deleted_at IS NULL OR %v.deleted_at <= '0001-01-02')", scope.QuotedTableName(), scope.QuotedTableName()) + primaryCondiations = append(primaryCondiations, sql) } if !scope.PrimaryKeyZero() {