Compare commits

..

4 Commits

Author SHA1 Message Date
e9b12dc3f6 Add support for int64 scans (#2)
All checks were successful
Build / build (push) Successful in 4m18s
Reviewed-on: #2
2025-05-14 15:21:32 +02:00
7daf1915a5 Fix yet another pointer
All checks were successful
Build / build (push) Successful in 41s
2025-05-09 10:55:16 +02:00
029cf6ce01 Merge pull request 'Add support for pointer arguments' (#1) from add-support-for-ptr-args into master
All checks were successful
Build / build (push) Successful in 36s
Reviewed-on: #1
2025-05-09 10:23:46 +02:00
278d7ed497 Add support for pointer arguments
All checks were successful
Build / build (push) Successful in 1m13s
2025-05-09 10:18:08 +02:00
2 changed files with 84 additions and 3 deletions

View File

@ -44,6 +44,18 @@ func (q *Query) bindInto(into *int, args ...any) *Query {
}
for i, arg := range args {
*into++
if arg == nil {
q.stmt.BindNull(*into)
continue
}
v := reflect.ValueOf(arg)
if v.Kind() == reflect.Ptr {
if v.IsNil() {
q.stmt.BindNull(*into)
continue
}
arg = v.Elem().Interface()
}
if asString, ok := arg.(string); ok {
q.stmt.BindText(*into, asString)
} else if asInt, ok := arg.(int); ok {
@ -54,7 +66,7 @@ func (q *Query) bindInto(into *int, args ...any) *Query {
q.stmt.BindBool(*into, asBool)
} else {
// Check if the argument is a slice or array of any type
v := reflect.ValueOf(arg)
v = reflect.ValueOf(arg)
if v.Kind() == reflect.Slice || v.Kind() == reflect.Array {
*into--
for i := 0; i < v.Len(); i++ {
@ -205,6 +217,8 @@ func (r *Rows) scanArgument(i int, arg any) error {
*asString = r.query.stmt.ColumnText(i)
} else if asInt, ok := arg.(*int); ok {
*asInt = r.query.stmt.ColumnInt(i)
} else if asInt, ok := arg.(*int64); ok {
*asInt = r.query.stmt.ColumnInt64(i)
} else if asBool, ok := arg.(*bool); ok {
*asBool = r.query.stmt.ColumnBool(i)
} else if reflect.TypeOf(arg).Kind() == reflect.Ptr && reflect.TypeOf(arg).Elem().Kind() == reflect.Ptr {

View File

@ -94,12 +94,70 @@ func TestUpdateQuery(t *testing.T) {
}
func TestUpdateQueryWithWrongArguments(t *testing.T) {
type S struct {
Field string
}
db := openTestDb(t)
value := "ipsum"
err := db.Query("insert into mytable(key, value) values ('lorem', ?)").Bind(&value).Exec()
abc := S{
Field: "ipsum",
}
err := db.Query("insert into mytable(key, value) values ('lorem', ?)").Bind(abc).Exec()
require.Error(t, err)
}
func TestUpdateQueryWithPointerValue(t *testing.T) {
db := openTestDb(t)
func() {
tx := db.MustBegin()
defer tx.MustRollback()
tx.Query("insert into mytable(key, value) values ('lorem', 'bar')").MustExec()
value := "ipsum"
key := "lorem"
tx.Query("update mytable set value = ? where key = ?").Bind(&value, key).MustExec()
tx.MustCommit()
}()
var value string
db.Query("select value from mytable where key = 'lorem'").MustScanSingle(&value)
require.Equal(t, "ipsum", value)
}
func TestUpdateQueryWithSetPointerValue(t *testing.T) {
type S struct {
value *string
}
db := openTestDb(t)
func() {
tx := db.MustBegin()
defer tx.MustRollback()
tx.Query("insert into mytable(key, value) values ('lorem', 'bar')").MustExec()
s := S{nil}
key := "lorem"
tx.Query("update mytable set value = ? where key = ?").Bind(s.value, key).MustExec()
tx.MustCommit()
}()
var value *string
db.Query("select value from mytable where key = 'lorem'").MustScanSingle(&value)
require.Equal(t, (*string)(nil), value)
}
func TestUpdateQueryWithNullValue(t *testing.T) {
db := openTestDb(t)
func() {
tx := db.MustBegin()
defer tx.MustRollback()
tx.Query("insert into mytable(key, value) values ('lorem', 'bar')").MustExec()
key := "lorem"
tx.Query("update mytable set value = ? where key = ?").Bind(nil, key).MustExec()
tx.MustCommit()
}()
var value *string
db.Query("select value from mytable where key = 'lorem'").MustScanSingle(&value)
require.Nil(t, value)
}
func TestQueryWithPointerStringArguments(t *testing.T) {
db := openTestDb(t)
var result *string
@ -109,6 +167,15 @@ func TestQueryWithPointerStringArguments(t *testing.T) {
require.Equal(t, "bar", *result)
}
func TestQueryWithInt64Scan(t *testing.T) {
db := openTestDb(t)
var result int64
err := db.Query("select 2").ScanSingle(&result)
require.NoError(t, err)
require.NotNil(t, result)
require.Equal(t, int64(2), result)
}
func TestQueryWithPointerStringArgumentsCanSetToNull(t *testing.T) {
db := openTestDb(t)
db.Query("update mytable set value=null where key = 'foo'").MustExec()