xorm/xorm
xorm/xorm
64
360
Fork 208
Code Issues 373 Pull Requests 17 Actions Releases 35 Activity

refactor exprParam #1825

Merged
lunny merged 2 commits from lunny/improve_expr into master 2021-06-09 01:05:50 +00:00
Conversation 0 Commits 2 Files Changed 5 +50 -49
3 changed files with 50 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 3ce08ca687 - Show all commits

63
internal/statements/expr_param.go
View File

@ -21,46 +21,47 @@ func (err ErrUnsupportedExprType) Error() string {
return fmt.Sprintf("Unsupported expression type: %v", err.tp) return fmt.Sprintf("Unsupported expression type: %v", err.tp)
} }
type exprParam struct { // Expr represents an SQL express
colName string type Expr struct {
arg interface{} ColName string
Arg interface{}
} }
type exprParams struct { type exprParams []Expr
ColNames []string
Args []interface{} func (exprs exprParams) ColNames() []string {
var cols = make([]string, 0, len(exprs))
for _, expr := range exprs {
cols = append(cols, expr.ColName)
}
return cols
} }
func (exprs *exprParams) Len() int { func (exprs exprParams) addParam(colName string, arg interface{}) {
return len(exprs.ColNames) exprs = append(exprs, Expr{colName, arg})
} }
func (exprs *exprParams) addParam(colName string, arg interface{}) { func (exprs exprParams) IsColExist(colName string) bool {
exprs.ColNames = append(exprs.ColNames, colName) for _, expr := range exprs {
exprs.Args = append(exprs.Args, arg) if strings.EqualFold(schemas.CommonQuoter.Trim(expr.ColName), schemas.CommonQuoter.Trim(colName)) {
}
func (exprs *exprParams) IsColExist(colName string) bool {
for _, name := range exprs.ColNames {
if strings.EqualFold(schemas.CommonQuoter.Trim(name), schemas.CommonQuoter.Trim(colName)) {
return true return true
} }
} }
return false return false
} }
func (exprs *exprParams) getByName(colName string) (exprParam, bool) { func (exprs exprParams) getByName(colName string) (Expr, bool) {
for i, name := range exprs.ColNames { for _, expr := range exprs {
if strings.EqualFold(name, colName) { if strings.EqualFold(expr.ColName, colName) {
return exprParam{name, exprs.Args[i]}, true return expr, true
} }
} }
return exprParam{}, false return Expr{}, false
} }
func (exprs *exprParams) WriteArgs(w *builder.BytesWriter) error { func (exprs exprParams) WriteArgs(w *builder.BytesWriter) error {
for i, expr := range exprs.Args { for i, expr := range exprs {
switch arg := expr.(type) { switch arg := expr.Arg.(type) {
case *builder.Builder: case *builder.Builder:
if _, err := w.WriteString("("); err != nil { if _, err := w.WriteString("("); err != nil {
return err return err
@ -84,7 +85,7 @@ func (exprs *exprParams) WriteArgs(w *builder.BytesWriter) error {
} }
w.Append(arg) w.Append(arg)
} }
if i != len(exprs.Args)-1 { if i != len(exprs)-1 {
if _, err := w.WriteString(","); err != nil { if _, err := w.WriteString(","); err != nil {
return err return err
} }
@ -93,16 +94,16 @@ func (exprs *exprParams) WriteArgs(w *builder.BytesWriter) error {
return nil return nil
} }
func (exprs *exprParams) writeNameArgs(w *builder.BytesWriter) error { func (exprs exprParams) writeNameArgs(w *builder.BytesWriter) error {
for i, colName := range exprs.ColNames { for i, expr := range exprs {
if _, err := w.WriteString(colName); err != nil { if _, err := w.WriteString(expr.ColName); err != nil {
return err return err
} }
if _, err := w.WriteString("="); err != nil { if _, err := w.WriteString("="); err != nil {
return err return err
} }
switch arg := exprs.Args[i].(type) { switch arg := expr.Arg.(type) {
case *builder.Builder: case *builder.Builder:
if _, err := w.WriteString("("); err != nil { if _, err := w.WriteString("("); err != nil {
return err return err
@ -114,10 +115,10 @@ func (exprs *exprParams) writeNameArgs(w *builder.BytesWriter) error {
return err return err
} }
default: default:
w.Append(exprs.Args[i]) w.Append(expr.Arg)
} }
if i+1 != len(exprs.ColNames) { if i+1 != len(exprs) {
if _, err := w.WriteString(","); err != nil { if _, err := w.WriteString(","); err != nil {
return err return err
} }

12
internal/statements/insert.go
View File

@ -59,7 +59,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
return "", nil, err return "", nil, err
} }
if err := statement.dialect.Quoter().JoinWrite(buf.Builder, append(colNames, exprs.ColNames...), ","); err != nil { if err := statement.dialect.Quoter().JoinWrite(buf.Builder, append(colNames, exprs.ColNames()...), ","); err != nil {
return "", nil, err return "", nil, err
} }
@ -79,7 +79,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
return "", nil, err return "", nil, err
} }
if len(exprs.Args) > 0 { if len(exprs) > 0 {
if _, err := buf.WriteString(","); err != nil { if _, err := buf.WriteString(","); err != nil {
return "", nil, err return "", nil, err
} }
@ -112,7 +112,7 @@ func (statement *Statement) GenInsertSQL(colNames []string, args []interface{})
return "", nil, err return "", nil, err
} }
if len(exprs.Args) > 0 { if len(exprs) > 0 {
if _, err := buf.WriteString(","); err != nil { if _, err := buf.WriteString(","); err != nil {
return "", nil, err return "", nil, err
} }
@ -152,7 +152,7 @@ func (statement *Statement) GenInsertMapSQL(columns []string, args []interface{}
return "", nil, err return "", nil, err
} }
if err := statement.dialect.Quoter().JoinWrite(buf.Builder, append(columns, exprs.ColNames...), ","); err != nil { if err := statement.dialect.Quoter().JoinWrite(buf.Builder, append(columns, exprs.ColNames()...), ","); err != nil {
return "", nil, err return "", nil, err
} }
@ -166,7 +166,7 @@ func (statement *Statement) GenInsertMapSQL(columns []string, args []interface{}
return "", nil, err return "", nil, err
} }
if len(exprs.Args) > 0 { if len(exprs) > 0 {
if _, err := buf.WriteString(","); err != nil { if _, err := buf.WriteString(","); err != nil {
return "", nil, err return "", nil, err
} }
@ -190,7 +190,7 @@ func (statement *Statement) GenInsertMapSQL(columns []string, args []interface{}
return "", nil, err return "", nil, err
} }
if len(exprs.Args) > 0 { if len(exprs) > 0 {
if _, err := buf.WriteString(","); err != nil { if _, err := buf.WriteString(","); err != nil {
return "", nil, err return "", nil, err
} }

24
session_update.go
View File

@ -224,35 +224,35 @@ func (session *Session) Update(bean interface{}, condiBean ...interface{}) (int6
// for update action to like "column = column + ?" // for update action to like "column = column + ?"
incColumns := session.statement.IncrColumns incColumns := session.statement.IncrColumns
for i, colName := range incColumns.ColNames { for _, expr := range incColumns {
colNames = append(colNames, session.engine.Quote(colName)+" = "+session.engine.Quote(colName)+" + ?") colNames = append(colNames, session.engine.Quote(expr.ColName)+" = "+session.engine.Quote(expr.ColName)+" + ?")
args = append(args, incColumns.Args[i]) args = append(args, expr.Arg)
} }
// for update action to like "column = column - ?" // for update action to like "column = column - ?"
decColumns := session.statement.DecrColumns decColumns := session.statement.DecrColumns
for i, colName := range decColumns.ColNames { for _, expr := range decColumns {
colNames = append(colNames, session.engine.Quote(colName)+" = "+session.engine.Quote(colName)+" - ?") colNames = append(colNames, session.engine.Quote(expr.ColName)+" = "+session.engine.Quote(expr.ColName)+" - ?")
args = append(args, decColumns.Args[i]) args = append(args, expr.Arg)
} }
// for update action to like "column = expression" // for update action to like "column = expression"
exprColumns := session.statement.ExprColumns exprColumns := session.statement.ExprColumns
for i, colName := range exprColumns.ColNames { for _, expr := range exprColumns {
switch tp := exprColumns.Args[i].(type) { switch tp := expr.Arg.(type) {
case string: case string:
if len(tp) == 0 { if len(tp) == 0 {
tp = "''" tp = "''"
} }
colNames = append(colNames, session.engine.Quote(colName)+"="+tp) colNames = append(colNames, session.engine.Quote(expr.ColName)+"="+tp)
case *builder.Builder: case *builder.Builder:
subQuery, subArgs, err := session.statement.GenCondSQL(tp) subQuery, subArgs, err := session.statement.GenCondSQL(tp)
if err != nil { if err != nil {
return 0, err return 0, err
} }
colNames = append(colNames, session.engine.Quote(colName)+"=("+subQuery+")") colNames = append(colNames, session.engine.Quote(expr.ColName)+"=("+subQuery+")")
args = append(args, subArgs...) args = append(args, subArgs...)
default: default:
colNames = append(colNames, session.engine.Quote(colName)+"=?") colNames = append(colNames, session.engine.Quote(expr.ColName)+"=?")
args = append(args, exprColumns.Args[i]) args = append(args, expr.Arg)
} }
} }