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
11 changes: 11 additions & 0 deletions pkg/bsql/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -212,5 +212,16 @@ func (l *ActionConfig) staticValidate(ctx context.Context, s *SQLSyncer) error {
availableVars[k] = config.Type
}

// An action defines either `query` or `queries`; both forms are accepted by
// ActionConfig.Validate and by the action handler, so validate whichever is set.
if len(l.Queries) > 0 {
for _, query := range l.Queries {
if err := validateVarsInQuery(s, query, availableVars); err != nil {
return err
}
}
return nil
}
Comment thread
alan-lee-12 marked this conversation as resolved.

return validateVarsInQuery(s, l.Query, availableVars)
}
38 changes: 38 additions & 0 deletions pkg/bsql/validate_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,44 @@ func TestValidate(t *testing.T) {
},
expectErr: true,
},
{
name: "action with singular query",
validator: &ActionConfig{
Query: "UPDATE users SET disabled = 1 WHERE id = ?<userid>",
Arguments: map[string]ArgumentConfig{
"userid": {Type: "string"},
},
},
expectErr: false,
},
{
// Actions may define `queries` instead of `query`; validating only the
// singular field rejected every multi-statement action outright.
name: "action with queries",
validator: &ActionConfig{
Queries: []string{
"UPDATE users SET disabled = 1 WHERE id = ?<userid>",
"DELETE FROM user_sessions WHERE user_id = ?<userid>",
},
Arguments: map[string]ArgumentConfig{
"userid": {Type: "string"},
},
},
expectErr: false,
},
{
name: "action with queries referencing undefined var",
validator: &ActionConfig{
Queries: []string{
"UPDATE users SET disabled = 1 WHERE id = ?<userid>",
"DELETE FROM user_sessions WHERE user_id = ?<unknown>",
},
Arguments: map[string]ArgumentConfig{
"userid": {Type: "string"},
},
},
expectErr: true,
},
}

for _, tc := range tcases {
Expand Down
Loading