Skip to content
Open
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
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
query.sql:1:1: could not determine data type of parameter $1
query.sql:5:1: could not determine data type of parameter $2
query.sql:8:8: column "foo" does not exist
query.sql:11:1: could not determine data type of parameter $2
query.sql:11:1: could not determine data type of parameter $3
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
query.sql:1:1: could not determine data type of parameter $1
query.sql:5:1: could not determine data type of parameter $2
query.sql:8:8: column "foo" does not exist
query.sql:11:1: could not determine data type of parameter $2
query.sql:11:1: could not determine data type of parameter $3
Original file line number Diff line number Diff line change
Expand Up @@ -2,4 +2,4 @@
query.sql:1:1: could not determine data type of parameter $1
query.sql:5:1: could not determine data type of parameter $2
query.sql:8:8: column "foo" does not exist
query.sql:11:1: could not determine data type of parameter $2
query.sql:11:1: could not determine data type of parameter $3
13 changes: 12 additions & 1 deletion internal/sql/preprocess/preprocess.go
Original file line number Diff line number Diff line change
Expand Up @@ -215,8 +215,8 @@ func Dialected(d Dialect, src string) *Result {
continue
}

stmt.Dollar, stmt.ParamErr = validatePlaceholders(occs)
stmt.Params = number(d, occs)
stmt.Dollar, stmt.ParamErr = validatePlaceholders(occs)
stmt.Numbers = map[int]int{}

prev := start
Expand Down Expand Up @@ -301,6 +301,17 @@ func validatePlaceholders(occs []occurrence) (dollar bool, err error) {
unnumbered = true
}
}

// sqlc.arg/narg/slice fill gaps in numbered dialects; include them so
// the gap check does not fire for positions they occupy.
if numbered && !unnumbered {
for _, occ := range occs {
if occ.kind == kindArg || occ.kind == kindNarg || occ.kind == kindSlice {
seen[occ.number] = true
}
}
}

if numbered && unnumbered {
return false, errors.New("can not mix $1 format with ? format")
}
Expand Down
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
INSERT INTO users (a, b, c) VALUES (sqlc.arg(a), @b, $3);
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
INSERT INTO users (a, b, c) VALUES ($1, $2, $3);
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
[
{
"start": 0,
"end": 48,
"dollar": true,
"params": [
{
"number": 1,
"location": 36,
"origin": 36,
"name": "a",
"named": true
},
{
"number": 2,
"location": 40,
"origin": 49,
"name": "b",
"named": true
},
{
"number": 3,
"location": 44,
"origin": 53,
"named": false
}
]
}
]
Loading