Refactor joining multiple tables with the same fields

This commit is contained in:
Jinzhu 2016-08-13 21:23:18 +08:00
parent ccb35db934
commit fde205f758
1 changed files with 17 additions and 78 deletions

View File

@ -495,12 +495,7 @@ func (scope *Scope) scan(rows *sql.Rows, columns []string, fields []*Field) {
} }
func (scope *Scope) primaryCondition(value interface{}) string { func (scope *Scope) primaryCondition(value interface{}) string {
format := "(%v = %v)" return fmt.Sprintf("(%v.%v = %v)", scope.QuotedTableName(), scope.Quote(scope.PrimaryKey()), value)
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v = %%v)", scope.New(value).QuotedTableName())
}
return fmt.Sprintf(format, scope.Quote(scope.PrimaryKey()), value)
} }
func (scope *Scope) buildWhereCondition(clause map[string]interface{}) (str string) { func (scope *Scope) buildWhereCondition(clause map[string]interface{}) (str string) {
@ -515,44 +510,24 @@ func (scope *Scope) buildWhereCondition(clause map[string]interface{}) (str stri
case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, sql.NullInt64: case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, sql.NullInt64:
return scope.primaryCondition(scope.AddToVars(value)) return scope.primaryCondition(scope.AddToVars(value))
case []int, []int8, []int16, []int32, []int64, []uint, []uint8, []uint16, []uint32, []uint64, []string, []interface{}: case []int, []int8, []int16, []int32, []int64, []uint, []uint8, []uint16, []uint32, []uint64, []string, []interface{}:
format := "(%v IN (?))" str = fmt.Sprintf("(%v.%v IN (?))", scope.QuotedTableName(), scope.Quote(scope.PrimaryKey()))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v IN (?))", scope.New(value).QuotedTableName())
}
str = fmt.Sprintf(format, scope.Quote(scope.PrimaryKey()))
clause["args"] = []interface{}{value} clause["args"] = []interface{}{value}
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 { if value != nil {
format := "(%v = %v)" sqls = append(sqls, fmt.Sprintf("(%v.%v = %v)", scope.QuotedTableName(), scope.Quote(key), scope.AddToVars(value)))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v = %%v)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(key), scope.AddToVars(value)))
} else { } else {
format := "(%v IS NULL)" sqls = append(sqls, fmt.Sprintf("(%v.%v IS NULL)", scope.QuotedTableName(), scope.Quote(key)))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v IS NULL)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(key)))
} }
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")
case interface{}: case interface{}:
var sqls []string var sqls []string
newScope := scope.New(value)
for _, field := range scope.New(value).Fields() { for _, field := range newScope.Fields() {
if !field.IsIgnored && !field.IsBlank { if !field.IsIgnored && !field.IsBlank {
format := "(%v = %v)" sqls = append(sqls, fmt.Sprintf("(%v.%v = %v)", newScope.QuotedTableName(), scope.Quote(field.DBName), scope.AddToVars(field.Field.Interface())))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v = %%v)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(field.DBName), scope.AddToVars(field.Field.Interface())))
} }
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")
@ -592,42 +567,20 @@ func (scope *Scope) buildNotCondition(clause map[string]interface{}) (str string
case string: case string:
// is number // is number
if regexp.MustCompile("^\\s*\\d+\\s*$").MatchString(value) { if regexp.MustCompile("^\\s*\\d+\\s*$").MatchString(value) {
format := "(%v <> %v)"
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v <> %%v)", scope.New(value).QuotedTableName())
}
id, _ := strconv.Atoi(value) id, _ := strconv.Atoi(value)
return fmt.Sprintf(format, scope.Quote(primaryKey), id) return fmt.Sprintf("(%v <> %v)", scope.Quote(primaryKey), id)
} else if regexp.MustCompile("(?i) (=|<>|>|<|LIKE|IS|IN) ").MatchString(value) { } else if regexp.MustCompile("(?i) (=|<>|>|<|LIKE|IS|IN) ").MatchString(value) {
str = fmt.Sprintf(" NOT (%v) ", value) str = fmt.Sprintf(" NOT (%v) ", value)
notEqualSQL = fmt.Sprintf("NOT (%v)", value) notEqualSQL = fmt.Sprintf("NOT (%v)", value)
} else { } else {
formatStr := "(%v NOT IN (?))" str = fmt.Sprintf("(%v.%v NOT IN (?))", scope.QuotedTableName(), scope.Quote(value))
formatNotEqualSQL := "(%v <> ?)" notEqualSQL = fmt.Sprintf("(%v.%v <> ?)", scope.QuotedTableName(), scope.Quote(value))
if len(scope.Search.joinConditions) > 0 {
formatStr = fmt.Sprintf("(%v.%%v NOT IN (?))", scope.New(value).QuotedTableName())
formatNotEqualSQL = fmt.Sprintf("(%v.%%v <> ?)", scope.New(value).QuotedTableName())
}
str = fmt.Sprintf(formatStr, scope.Quote(value))
notEqualSQL = fmt.Sprintf(formatNotEqualSQL, scope.Quote(value))
} }
case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, sql.NullInt64: case int, int8, int16, int32, int64, uint, uint8, uint16, uint32, uint64, sql.NullInt64:
format := "(%v <> %v)" return fmt.Sprintf("(%v.%v <> %v)", scope.QuotedTableName(), scope.Quote(primaryKey), value)
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v <> %%v)", scope.New(value).QuotedTableName())
}
return fmt.Sprintf(format, scope.Quote(primaryKey), value)
case []int, []int8, []int16, []int32, []int64, []uint, []uint8, []uint16, []uint32, []uint64, []string: case []int, []int8, []int16, []int32, []int64, []uint, []uint8, []uint16, []uint32, []uint64, []string:
if reflect.ValueOf(value).Len() > 0 { if reflect.ValueOf(value).Len() > 0 {
format := "(%v NOT IN (?))" str = fmt.Sprintf("(%v.%v NOT IN (?))", scope.QuotedTableName(), scope.Quote(primaryKey))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v NOT IN (?))", scope.New(value).QuotedTableName())
}
str = fmt.Sprintf(format, scope.Quote(primaryKey))
clause["args"] = []interface{}{value} clause["args"] = []interface{}{value}
} }
return "" return ""
@ -635,32 +588,18 @@ func (scope *Scope) buildNotCondition(clause map[string]interface{}) (str string
var sqls []string var sqls []string
for key, value := range value { for key, value := range value {
if value != nil { if value != nil {
format := "(%v <> %v)" sqls = append(sqls, fmt.Sprintf("(%v.%v <> %v)", scope.QuotedTableName(), scope.Quote(key), scope.AddToVars(value)))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v <> %%v)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(key), scope.AddToVars(value)))
} else { } else {
format := "(%v IS NOT NULL)" sqls = append(sqls, fmt.Sprintf("(%v.%v IS NOT NULL)", scope.QuotedTableName(), scope.Quote(key)))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v IS NOT NULL)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(key)))
} }
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")
case interface{}: case interface{}:
var sqls []string var sqls []string
for _, field := range scope.New(value).Fields() { var newScope = scope.New(value)
for _, field := range newScope.Fields() {
if !field.IsBlank { if !field.IsBlank {
format := "(%v <> %v)" sqls = append(sqls, fmt.Sprintf("(%v.%v <> %v)", newScope.QuotedTableName(), scope.Quote(field.DBName), scope.AddToVars(field.Field.Interface())))
if len(scope.Search.joinConditions) > 0 {
format = fmt.Sprintf("(%v.%%v <> %%v)", scope.New(value).QuotedTableName())
}
sqls = append(sqls, fmt.Sprintf(format, scope.Quote(field.DBName), scope.AddToVars(field.Field.Interface())))
} }
} }
return strings.Join(sqls, " AND ") return strings.Join(sqls, " AND ")