re
/
gorm
forked from mirror/gorm
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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.

This commit is contained in:
Andrew Brampton 2015-01-11 13:49:36 -08:00
parent 3500dfa1b6
commit fef286a7bc
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
scope_private.go
View File

@ -168,7 +168,8 @@ func (scope *Scope) whereSql() (sql string) {
var primaryCondiations, andConditions, orConditions []string var primaryCondiations, andConditions, orConditions []string
if !scope.Search.Unscope && scope.HasColumn("DeletedAt") { 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() { if !scope.PrimaryKeyZero() {