Compare commits
1 Commits
v0.12.0
...
637797116d
| Author | SHA1 | Date | |
|---|---|---|---|
| 637797116d |
8
query.go
8
query.go
@@ -44,17 +44,13 @@ func (q *Query) bindInto(into *int, args ...any) *Query {
|
|||||||
}
|
}
|
||||||
for i, arg := range args {
|
for i, arg := range args {
|
||||||
*into++
|
*into++
|
||||||
if arg == nil {
|
|
||||||
q.stmt.BindNull(*into)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
v := reflect.ValueOf(arg)
|
v := reflect.ValueOf(arg)
|
||||||
if v.Kind() == reflect.Ptr {
|
if v.Kind() == reflect.Ptr {
|
||||||
if v.IsNil() {
|
if v.IsNil() {
|
||||||
q.stmt.BindNull(*into)
|
q.stmt.BindNull(*into)
|
||||||
continue
|
continue
|
||||||
}
|
}
|
||||||
arg = v.Elem().Interface()
|
arg = v.Elem().Interface() // Dereference the pointer
|
||||||
}
|
}
|
||||||
if asString, ok := arg.(string); ok {
|
if asString, ok := arg.(string); ok {
|
||||||
q.stmt.BindText(*into, asString)
|
q.stmt.BindText(*into, asString)
|
||||||
@@ -217,8 +213,6 @@ func (r *Rows) scanArgument(i int, arg any) error {
|
|||||||
*asString = r.query.stmt.ColumnText(i)
|
*asString = r.query.stmt.ColumnText(i)
|
||||||
} else if asInt, ok := arg.(*int); ok {
|
} else if asInt, ok := arg.(*int); ok {
|
||||||
*asInt = r.query.stmt.ColumnInt(i)
|
*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 {
|
} else if asBool, ok := arg.(*bool); ok {
|
||||||
*asBool = r.query.stmt.ColumnBool(i)
|
*asBool = r.query.stmt.ColumnBool(i)
|
||||||
} else if reflect.TypeOf(arg).Kind() == reflect.Ptr && reflect.TypeOf(arg).Elem().Kind() == reflect.Ptr {
|
} else if reflect.TypeOf(arg).Kind() == reflect.Ptr && reflect.TypeOf(arg).Elem().Kind() == reflect.Ptr {
|
||||||
|
|||||||
@@ -94,14 +94,9 @@ func TestUpdateQuery(t *testing.T) {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func TestUpdateQueryWithWrongArguments(t *testing.T) {
|
func TestUpdateQueryWithWrongArguments(t *testing.T) {
|
||||||
type S struct {
|
|
||||||
Field string
|
|
||||||
}
|
|
||||||
db := openTestDb(t)
|
db := openTestDb(t)
|
||||||
abc := S{
|
value := "ipsum"
|
||||||
Field: "ipsum",
|
err := db.Query("insert into mytable(key, value) values ('lorem', ?)").Bind(&value).Exec()
|
||||||
}
|
|
||||||
err := db.Query("insert into mytable(key, value) values ('lorem', ?)").Bind(abc).Exec()
|
|
||||||
require.Error(t, err)
|
require.Error(t, err)
|
||||||
}
|
}
|
||||||
|
|
||||||
@@ -122,26 +117,6 @@ func TestUpdateQueryWithPointerValue(t *testing.T) {
|
|||||||
require.Equal(t, "ipsum", 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) {
|
func TestUpdateQueryWithNullValue(t *testing.T) {
|
||||||
db := openTestDb(t)
|
db := openTestDb(t)
|
||||||
func() {
|
func() {
|
||||||
@@ -153,7 +128,7 @@ func TestUpdateQueryWithNullValue(t *testing.T) {
|
|||||||
tx.MustCommit()
|
tx.MustCommit()
|
||||||
}()
|
}()
|
||||||
|
|
||||||
var value *string
|
var value string
|
||||||
db.Query("select value from mytable where key = 'lorem'").MustScanSingle(&value)
|
db.Query("select value from mytable where key = 'lorem'").MustScanSingle(&value)
|
||||||
require.Nil(t, value)
|
require.Nil(t, value)
|
||||||
}
|
}
|
||||||
@@ -167,15 +142,6 @@ func TestQueryWithPointerStringArguments(t *testing.T) {
|
|||||||
require.Equal(t, "bar", *result)
|
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) {
|
func TestQueryWithPointerStringArgumentsCanSetToNull(t *testing.T) {
|
||||||
db := openTestDb(t)
|
db := openTestDb(t)
|
||||||
db.Query("update mytable set value=null where key = 'foo'").MustExec()
|
db.Query("update mytable set value=null where key = 'foo'").MustExec()
|
||||||
|
|||||||
Reference in New Issue
Block a user