Skip to content

Commit

Permalink
Merge pull request #5 from tmlbl/main
Browse files Browse the repository at this point in the history
  • Loading branch information
mstg authored Sep 14, 2023
2 parents 737c3e8 + cf64c93 commit d39dbc9
Show file tree
Hide file tree
Showing 2 changed files with 36 additions and 0 deletions.
6 changes: 6 additions & 0 deletions pika_psql.go
Original file line number Diff line number Diff line change
Expand Up @@ -321,6 +321,9 @@ func (b *basePsql[T]) GetOrNil() (*T, error) {
}

q, args := b.GetOrNilQuery()
if b.err != nil {
return nil, b.err
}

// Execute query
var x T
Expand Down Expand Up @@ -778,6 +781,9 @@ func (b *basePsql[T]) filterStatement() (string, []any) {
if _, ok := b.args.Get(noWildcard[1:]); ok {
// If mapping found, replace with numbered parameter
v = fmt.Sprintf("$%d", mapping[noWildcard[1:]])
} else {
b.err = fmt.Errorf("missing argument: %s", noWildcard)
return "", nil
}
}
andOr := "AND"
Expand Down
30 changes: 30 additions & 0 deletions pika_psql_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -1658,3 +1658,33 @@ func TestJoinCount(t *testing.T) {
require.Nil(t, err)
require.Equal(t, 1, ret)
}

func TestFilterMissingArgs(t *testing.T) {
psql := newPsql(t)
qs := Q[simpleModel1](psql)
args := NewArgs()

qs = qs.Filter("id=:id").Args(args)

requireError := func(err error) {
require.NotNil(t, err)
require.NotContains(t, err.Error(), "syntax")
require.Contains(t, err.Error(), "missing argument")
}

ret, err := qs.GetOrNil()
require.Nil(t, ret)
requireError(err)

_, err = qs.Get()
requireError(err)

err = qs.Delete()
requireError(err)

_, err = qs.All()
requireError(err)

_, err = qs.Count()
requireError(err)
}

0 comments on commit d39dbc9

Please sign in to comment.