Skip to content

fix: named params contribute to batch parameter count #1841

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
kyleconroy merged 2 commits into from
Sep 16, 2022
Merged

fix: named params contribute to batch parameter count #1841

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
157bc65
fix: named params contribute to batch parameter count
chrisyxlee Sep 9, 2022
5ffeed0
move validation after rewriting named parameters
chrisyxlee Sep 9, 2022
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
88 changes: 88 additions & 0 deletions examples/batch/postgresql/batch.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 2 additions & 0 deletions examples/batch/postgresql/querier.go
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions examples/batch/postgresql/query.sql
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,14 @@ WHERE book_id = $1;
DELETE FROM books
WHERE book_id = $1;

-- name: DeleteBookNamedFunc :batchexec
DELETE FROM books
WHERE book_id = sqlc.arg(book_id);

-- name: DeleteBookNamedSign :batchexec
DELETE FROM books
WHERE book_id = @book_id;

-- name: BooksByYear :batchmany
SELECT * FROM books
WHERE year = $1;
Expand Down
3 changes: 1 addition & 2 deletions internal/compiler/parse.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -80,11 +80,10 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
if err != nil {
return nil, err
}
raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
if err := validate.Cmd(raw.Stmt, name, cmd); err != nil {
return nil, err
}

raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
rvs := rangeVars(raw.Stmt)
refs, err := findParameters(raw.Stmt)
if err != nil {
Expand Down