Skip to content
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.

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

Improve error messaging for empty named parameter keys #920

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
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.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
8 changes: 7 additions & 1 deletion named.go
Original file line number Diff line number Diff line change
Expand Up @@ -181,6 +181,9 @@ func bindArgs(names []string, arg interface{}, m *reflectx.Mapper) ([]interface{

err := m.TraversalsByNameFunc(v.Type(), names, func(i int, t []int) error {
if len(t) == 0 {
if names[i] == "" {
return fmt.Errorf("sqlx.bindArgs: empty named parameter at index %d in %#v", i, names)
}
return fmt.Errorf("could not find name %s in %#v", names[i], arg)
}

Expand All @@ -197,7 +200,10 @@ func bindArgs(names []string, arg interface{}, m *reflectx.Mapper) ([]interface{
func bindMapArgs(names []string, arg map[string]interface{}) ([]interface{}, error) {
arglist := make([]interface{}, 0, len(names))

for _, name := range names {
for i, name := range names {
if name == "" {
return arglist, fmt.Errorf("sqlx.bindMapArgs: empty named parameter at index %d in %#v", i, names)
}
val, ok := arg[name]
if !ok {
return arglist, fmt.Errorf("could not find name %s in %#v", name, arg)
Expand Down
10 changes: 10 additions & 0 deletions named_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,6 +3,7 @@ package sqlx
import (
"database/sql"
"fmt"
"strings"
"testing"
)

Expand Down Expand Up @@ -299,6 +300,15 @@ func TestNamedQueries(t *testing.T) {
t.Errorf("expected %s, got %s", sl.Email, p2.Email)
}

_, _, err = db.BindNamed("SELECT * FROM person WHERE id=:id /*TODO: handle accidental colon in named query*/", struct{ID int `db:"id"`}{1})
if err == nil || !strings.Contains(err.Error(), "sqlx.bindArgs: empty named parameter") {
t.Error("Expected an empty named parameter error with struct arg.")
}

_, _, err = db.BindNamed("SELECT * FROM person WHERE id=:id /*TODO: handle accidental colon in named query*/", map[string]interface{}{"id": 1})
if err == nil || !strings.Contains(err.Error(), "sqlx.bindMapArgs: empty named parameter") {
t.Error("Expected an empty named parameter error with map arg.")
}
})
}

Expand Down