Compare commits
No commits in common. "master" and "v0.11.0" have entirely different histories.
6
query.go
6
query.go
@ -50,10 +50,6 @@ func (q *Query) bindInto(into *int, args ...any) *Query {
|
|||||||
}
|
}
|
||||||
v := reflect.ValueOf(arg)
|
v := reflect.ValueOf(arg)
|
||||||
if v.Kind() == reflect.Ptr {
|
if v.Kind() == reflect.Ptr {
|
||||||
if v.IsNil() {
|
|
||||||
q.stmt.BindNull(*into)
|
|
||||||
continue
|
|
||||||
}
|
|
||||||
arg = v.Elem().Interface()
|
arg = v.Elem().Interface()
|
||||||
}
|
}
|
||||||
if asString, ok := arg.(string); ok {
|
if asString, ok := arg.(string); ok {
|
||||||
@ -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 {
|
||||||
|
@ -122,26 +122,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() {
|
||||||
@ -167,15 +147,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()
|
||||||
|
Loading…
x
Reference in New Issue
Block a user