Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 9 additions & 1 deletion internal/mysql/param.go
Original file line number Diff line number Diff line change
Expand Up @@ -44,12 +44,20 @@ func paramsInLimitExpr(limit *sqlparser.Limit, s *Schema, tableAliasMap FromTabl

func paramsInWhereExpr(e sqlparser.SQLNode, s *Schema, tableAliasMap FromTables, defaultTable string, settings dinosql.GenerateSettings) ([]*Param, error) {
params := []*Param{}
if e == nil {
return params, nil
} else if expr, ok := e.(*sqlparser.Where); ok {
if expr == nil {
return params, nil
}
e = expr.Expr
}
switch v := e.(type) {
case *sqlparser.Where:
if v == nil {
return params, nil
}
return paramsInWhereExpr(v.Expr, s, tableAliasMap, defaultTable, settings)
return paramsInWhereExpr(v, s, tableAliasMap, defaultTable, settings)
case *sqlparser.ComparisonExpr:
p, found, err := paramInComparison(v, s, tableAliasMap, defaultTable, settings)
if err != nil {
Expand Down
8 changes: 5 additions & 3 deletions internal/mysql/parse.go
Original file line number Diff line number Diff line change
Expand Up @@ -272,8 +272,10 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
params := []*Param{}
for _, updateExpr := range node.Exprs {
col := updateExpr.Name
newValue, isParam := updateExpr.Expr.(*sqlparser.SQLVal)
if !isParam {
newValue, isValue := updateExpr.Expr.(*sqlparser.SQLVal)
if !isValue {
continue
} else if isParam := newValue.Type == sqlparser.ValArg; !isParam {
continue
}
colDfn, err := s.getColType(col, tableAliasMap, defaultTable)
Expand All @@ -289,7 +291,7 @@ func parseUpdate(node *sqlparser.Update, query string, s *Schema, settings dinos
params = append(params, &param)
}

whereParams, err := paramsInWhereExpr(node.Where.Expr, s, tableAliasMap, defaultTable, settings)
whereParams, err := paramsInWhereExpr(node.Where, s, tableAliasMap, defaultTable, settings)
if err != nil {
return nil, fmt.Errorf("failed to parse params from WHERE expression: %w", err)
}
Expand Down
16 changes: 16 additions & 0 deletions internal/mysql/parse_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -388,6 +388,22 @@ UPDATE users SET first_name = ?, last_name = ? WHERE id > ? AND first_name = ? L
SchemaLookup: mockSchema,
},
},
testCase{
name: "update_without_where",
input: expected{
query: "/* name: UpdateAllUsers :exec */ update users set first_name = 'Bob'",
schema: mockSchema,
},
output: &Query{
SQL: "update users set first_name = 'Bob'",
Columns: nil,
Params: []*Param{},
Name: "UpdateAllUsers",
Cmd: ":exec",
DefaultTableName: "users",
SchemaLookup: mockSchema,
},
},
testCase{
name: "update_users",
input: expected{
Expand Down