Skip to content

Commit 1a28c29

Browse files
authored
fix: named params contribute to batch parameter count (#1841)
1 parent f61a5d5 commit 1a28c29

File tree

4 files changed

+99
-2
lines changed

4 files changed

+99
-2
lines changed

examples/batch/postgresql/batch.go

Lines changed: 88 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/batch/postgresql/querier.go

Lines changed: 2 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

examples/batch/postgresql/query.sql

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,14 @@ WHERE book_id = $1;
1010
DELETE FROM books
1111
WHERE book_id = $1;
1212

13+
-- name: DeleteBookNamedFunc :batchexec
14+
DELETE FROM books
15+
WHERE book_id = sqlc.arg(book_id);
16+
17+
-- name: DeleteBookNamedSign :batchexec
18+
DELETE FROM books
19+
WHERE book_id = @book_id;
20+
1321
-- name: BooksByYear :batchmany
1422
SELECT * FROM books
1523
WHERE year = $1;

internal/compiler/parse.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,10 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
8080
if err != nil {
8181
return nil, err
8282
}
83+
raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
8384
if err := validate.Cmd(raw.Stmt, name, cmd); err != nil {
8485
return nil, err
8586
}
86-
87-
raw, namedParams, edits := rewrite.NamedParameters(c.conf.Engine, raw, numbers, dollar)
8887
rvs := rangeVars(raw.Stmt)
8988
refs, err := findParameters(raw.Stmt)
9089
if err != nil {

0 commit comments

Comments
 (0)