Skip to content

feat: support case-insensitive query parameter matching #823

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

Open
olavloite wants to merge 2 commits into
base: main
Choose a base branch
from
Open

feat: support case-insensitive query parameter matching #823

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
5513d9a
feat(driver): support case-insensitive query parameter matching
olavloite Jun 11, 2026
0bc8092
chore: address review comments
olavloite Jun 12, 2026
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
32 changes: 32 additions & 0 deletions stmt.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,7 @@ import (
"database/sql/driver"
"fmt"
"strconv"
"strings"

"cloud.google.com/go/spanner"
"github.com/googleapis/go-sql-spanner/connectionstate"
Expand Down Expand Up @@ -107,6 +108,37 @@ func prepareSpannerStmt(state *connectionstate.ConnectionState, parser *parser.S
name = sa.NameInQuery
value = sa.Value
}
if name != "" {
found := false
if _, ok := namesToIndex[name]; ok {
found = true
}
if !found {
for _, queryName := range names {
if queryName == name {
found = true
break
}
}
}
if !found && len(namesToIndex) > 0 {
for queryName := range namesToIndex {
if strings.EqualFold(queryName, name) {
name = queryName
found = true
break
}
}
}
if !found {
for _, queryName := range names {
if strings.EqualFold(queryName, name) {
name = queryName
break
}
}
}
}
Comment thread
olavloite marked this conversation as resolved.
if name == "" && len(names) > i {
name = names[i]
} else if index, ok := namesToIndex[name]; ok {
Expand Down
32 changes: 32 additions & 0 deletions stmt_with_mockserver_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -534,6 +534,24 @@ func TestNamedParametersWithGoogleSQL(t *testing.T) {
input: "insert into my_table (id, initial_value, current_value, generation) values (@id, @value, @value, @id)",
wantParams: map[string]string{"id": "1", "value": "One"},
},
{
name: "case_insensitive",
params: []any{sql.Named("ID", 1), sql.Named("Value", "One")},
input: "insert into my_table (id, value) values (@id, @value)",
wantParams: map[string]string{"id": "1", "value": "One"},
},
{
name: "case_insensitive_2",
params: []any{sql.Named("id", 1), sql.Named("value", "One")},
input: "insert into my_table (id, value) values (@ID, @VALUE)",
wantParams: map[string]string{"ID": "1", "VALUE": "One"},
},
{
name: "case_insensitive_exact_match_priority",
params: []any{sql.Named("id", 1), sql.Named("ID", 2)},
input: "insert into my_table (id, value) values (@id, @ID)",
wantParams: map[string]string{"id": "1", "ID": "2"},
},
{
name: "input_out_of_order",
params: []any{sql.Named("value", "One"), sql.Named("id", 1)},
Expand Down Expand Up @@ -738,6 +756,20 @@ func TestNamedParametersWithPG(t *testing.T) {
wantSQL: "insert into my_table (id, initial_value, current_value, generation) values ($1, $2, $2, $1)",
wantParams: map[string]string{"p1": "1", "p2": "One"},
},
{
name: "case_insensitive",
params: []any{sql.Named("ID", 1), sql.Named("Value", "One")},
input: "insert into my_table (id, value) values (@id, @value)",
wantSQL: "insert into my_table (id, value) values ($1, $2)",
wantParams: map[string]string{"p1": "1", "p2": "One"},
},
{
name: "case_insensitive_2",
params: []any{sql.Named("id", 1), sql.Named("value", "One")},
input: "insert into my_table (id, value) values (@ID, @VALUE)",
wantSQL: "insert into my_table (id, value) values ($1, $2)",
wantParams: map[string]string{"p1": "1", "p2": "One"},
},
{
name: "input_out_of_order",
params: []any{sql.Named("value", "One"), sql.Named("id", 1)},
Expand Down
Loading