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

value format refactoring

Browse Source
This commit is contained in:
Nikita Koryabkin 2019-12-03 13:23:01 +03:00
parent 6a0d065664
commit f6b5cd9c12
1 changed files with 12 additions and 18 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
scope.go
View File

@ -573,29 +573,13 @@ func (scope *Scope) buildCondition(clause map[string]interface{}, include bool)
case map[string]interface{}: case map[string]interface{}:
var sqls []string var sqls []string
for key, value := range value { for key, value := range value {
if value != nil { sqls = append(sqls, scope.formatValue(quotedTableName, key, equalSQL, value, include))
sqls = append(sqls, fmt.Sprintf("(%v.%v %s %v)", quotedTableName, scope.Quote(key), equalSQL, scope.AddToVars(value)))
} else {
if !include {
sqls = append(sqls, fmt.Sprintf("(%v.%v IS NOT NULL)", quotedTableName, scope.Quote(key)))
} else {
sqls = append(sqls, fmt.Sprintf("(%v.%v IS NULL)", quotedTableName, scope.Quote(key)))
}
}
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")
case []sql.NamedArg: case []sql.NamedArg:
var sqls []string var sqls []string
for _, val := range value { for _, val := range value {
if val.Value != nil { sqls = append(sqls, scope.formatValue(quotedTableName, val.Name, equalSQL, val.Value, include))
sqls = append(sqls, fmt.Sprintf("(%v.%v %s %v)", quotedTableName, scope.Quote(val.Name), equalSQL, scope.AddToVars(val)))
} else {
if !include {
sqls = append(sqls, fmt.Sprintf("(%v.%v IS NOT NULL)", quotedTableName, scope.Quote(val.Name)))
} else {
sqls = append(sqls, fmt.Sprintf("(%v.%v IS NULL)", quotedTableName, scope.Quote(val.Name)))
}
}
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")
case interface{}: case interface{}:
@ -683,6 +667,16 @@ func (scope *Scope) buildCondition(clause map[string]interface{}, include bool)
return return
} }
func (scope *Scope) formatValue(qtm, key, equalSQL string, value interface{}, include bool) string {
if value != nil {
return fmt.Sprintf("(%v.%v %s %v)", qtm, scope.Quote(key), equalSQL, scope.AddToVars(value))
}
if include {
return fmt.Sprintf("(%v.%v IS NULL)", qtm, scope.Quote(key))
}
return fmt.Sprintf("(%v.%v IS NOT NULL)", qtm, scope.Quote(key))
}
func (scope *Scope) buildSelectQuery(clause map[string]interface{}) (str string) { func (scope *Scope) buildSelectQuery(clause map[string]interface{}) (str string) {
switch value := clause["query"].(type) { switch value := clause["query"].(type) {
case string: case string: