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

Merge bf8bb4ea7a309c9f081ab39a3fe7b280862fd642 into 89f6d74b5ebab61a964b7a69c865a16cf9f24821

Browse Source
This commit is contained in:
Herbert Natal 2017-01-25 09:48:48 +00:00 committed by GitHub
commit 91bc4c4ad4
3 changed files with 30 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
callback_delete.go
View File

@ -34,13 +34,19 @@ func deleteCallback(scope *Scope) {
}
if !scope.Search.Unscoped && scope.HasColumn("DeletedAt") {
scope.Raw(fmt.Sprintf(
"UPDATE %v SET deleted_at=%v%v%v",
scope.QuotedTableName(),
scope.AddToVars(NowFunc()),
addExtraSpaceIfExist(scope.CombinedConditionSql()),
addExtraSpaceIfExist(extraOption),
)).Exec()
for _, field := range scope.Fields() {
if field.Name == "DeletedAt" {
scope.Raw(fmt.Sprintf(
"UPDATE %v SET %v=%v%v%v",
scope.QuotedTableName(),
scope.Quote(field.DBName),
scope.AddToVars(NowFunc()),
addExtraSpaceIfExist(scope.CombinedConditionSql()),
addExtraSpaceIfExist(extraOption),
)).Exec()
}
}
} else {
scope.Raw(fmt.Sprintf(
"DELETE FROM %v%v%v",

10
gorm.iml Normal file
View File

@ -0,0 +1,10 @@
<?xml version="1.0" encoding="UTF-8"?>
<module type="GO_MODULE" version="4">
<component name="NewModuleRootManager" inherit-compiler-output="true">
<exclude-output />
<content url="file://$MODULE_DIR$" />
<orderEntry type="jdk" jdkName="Go 1.6" jdkType="Go SDK" />
<orderEntry type="sourceFolder" forTests="false" />
<orderEntry type="library" name="GOPATH &lt;gorm&gt;" level="project" />
</component>
</module>

11
scope.go
View File

@ -676,11 +676,14 @@ func (scope *Scope) whereSQL() (sql string) {
primaryConditions, andConditions, orConditions []string
)
if !scope.Search.Unscoped && scope.HasColumn("deleted_at") {
sql := fmt.Sprintf("%v.deleted_at IS NULL", quotedTableName)
primaryConditions = append(primaryConditions, sql)
if !scope.Search.Unscoped && scope.HasColumn("DeletedAt") {
for _, field := range scope.Fields() {
if field.Name == "DeletedAt" {
sql := fmt.Sprintf("%v.%v IS NULL", quotedTableName, scope.Quote(field.DBName))
primaryConditions = append(primaryConditions, sql)
}
}
}
if !scope.PrimaryKeyZero() {
for _, field := range scope.PrimaryFields() {
sql := fmt.Sprintf("%v.%v = %v", quotedTableName, scope.Quote(field.DBName), scope.AddToVars(field.Field.Interface()))