Suggest: 类型判断 switch v.(type) 可以写得更简单一点 #1663

New Issue

azhai · 2020-04-25T03:26:49Z

azhai commented

2020-04-25 03:26:49 +00:00

以这段代码 internal/statements/statement.go 第 211 行为例

原来的代码

// And add Where & and statement
func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
	switch query.(type) {
	case string:
		cond := builder.Expr(query.(string), args...)
		statement.cond = statement.cond.And(cond)
	case map[string]interface{}:
		queryMap := query.(map[string]interface{})
		newMap := make(map[string]interface{})
		for k, v := range queryMap {
			newMap[statement.quote(k)] = v
		}
		statement.cond = statement.cond.And(builder.Eq(newMap))
	case builder.Cond:
		cond := query.(builder.Cond)
		statement.cond = statement.cond.And(cond)
		for _, v := range args {
			if vv, ok := v.(builder.Cond); ok {
				statement.cond = statement.cond.And(vv)
			}
		}
	default:
		statement.LastError = ErrConditionType
	}

	return statement
}

可以改写为

// And add Where & and statement
func (statement *Statement) And(query interface{}, args ...interface{}) *Statement {
	switch qr := query.(type) {
	case string:
		cond := builder.Expr(qr, args...)
		statement.cond = statement.cond.And(cond)
	case map[string]interface{}:
		cond := make(builder.Eq)
		for k, v := range qr {
			cond[statement.quote(k)] = v
		}
		statement.cond = statement.cond.And(cond)
	case builder.Cond:
		statement.cond = statement.cond.And(qr)
		for _, v := range args {
			if vv, ok := v.(builder.Cond); ok {
				statement.cond = statement.cond.And(vv)
			}
		}
	default:
		statement.LastError = ErrConditionType
	}

	return statement
}

以这段代码 internal/statements/statement.go 第 211 行为例原来的代码 ```go // And add Where & and statement func (statement *Statement) And(query interface{}, args ...interface{}) *Statement { switch query.(type) { case string: cond := builder.Expr(query.(string), args...) statement.cond = statement.cond.And(cond) case map[string]interface{}: queryMap := query.(map[string]interface{}) newMap := make(map[string]interface{}) for k, v := range queryMap { newMap[statement.quote(k)] = v } statement.cond = statement.cond.And(builder.Eq(newMap)) case builder.Cond: cond := query.(builder.Cond) statement.cond = statement.cond.And(cond) for _, v := range args { if vv, ok := v.(builder.Cond); ok { statement.cond = statement.cond.And(vv) } } default: statement.LastError = ErrConditionType } return statement } ``` 可以改写为 ```go // And add Where & and statement func (statement *Statement) And(query interface{}, args ...interface{}) *Statement { switch qr := query.(type) { case string: cond := builder.Expr(qr, args...) statement.cond = statement.cond.And(cond) case map[string]interface{}: cond := make(builder.Eq) for k, v := range qr { cond[statement.quote(k)] = v } statement.cond = statement.cond.And(cond) case builder.Cond: statement.cond = statement.cond.And(qr) for _, v := range args { if vv, ok := v.(builder.Cond); ok { statement.cond = statement.cond.And(vv) } } default: statement.LastError = ErrConditionType } return statement } ```

lunny commented

2020-04-25 04:02:07 +00:00

Please send a PR. Thanks in advance!

lunny referenced this issue from a commit

2021-06-12 09:54:37 +00:00

Fix #1663

lunny added this to the 1.1.1 milestone 2021-06-12 09:54:39 +00:00

lunny referenced a pull request that will close this issue

2021-06-12 09:54:55 +00:00

Fix #1663 #1952

lunny added the

kind