Skip to content

Commit 610e192

Browse files
committed
#3166 fix preprocessor bug
1 parent bdbe55d commit 610e192

4 files changed

Lines changed: 43 additions & 1 deletion

File tree

‎internal/sql/preprocess/preprocess.go‎

Lines changed: 12 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -215,8 +215,8 @@ func Dialected(d Dialect, src string) *Result {
215215
continue
216216
}
217217

218-
stmt.Dollar, stmt.ParamErr = validatePlaceholders(occs)
219218
stmt.Params = number(d, occs)
219+
stmt.Dollar, stmt.ParamErr = validatePlaceholders(occs)
220220
stmt.Numbers = map[int]int{}
221221

222222
prev := start
@@ -301,6 +301,17 @@ func validatePlaceholders(occs []occurrence) (dollar bool, err error) {
301301
unnumbered = true
302302
}
303303
}
304+
305+
// sqlc.arg/narg/slice fill gaps in numbered dialects; include them so
306+
// the gap check does not fire for positions they occupy.
307+
if numbered && !unnumbered {
308+
for _, occ := range occs {
309+
if occ.kind == kindArg || occ.kind == kindNarg || occ.kind == kindSlice {
310+
seen[occ.number] = true
311+
}
312+
}
313+
}
314+
304315
if numbered && unnumbered {
305316
return false, errors.New("can not mix $1 format with ? format")
306317
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
INSERT INTO users (a, b, c) VALUES (sqlc.arg(a), @b, $3);
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
INSERT INTO users (a, b, c) VALUES ($1, $2, $3);
Lines changed: 29 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,29 @@
1+
[
2+
{
3+
"start": 0,
4+
"end": 48,
5+
"dollar": true,
6+
"params": [
7+
{
8+
"number": 1,
9+
"location": 36,
10+
"origin": 36,
11+
"name": "a",
12+
"named": true
13+
},
14+
{
15+
"number": 2,
16+
"location": 40,
17+
"origin": 49,
18+
"name": "b",
19+
"named": true
20+
},
21+
{
22+
"number": 3,
23+
"location": 44,
24+
"origin": 53,
25+
"named": false
26+
}
27+
]
28+
}
29+
]

0 commit comments

Comments
 (0)