Skip to content

Commit

Permalink
FEATURE: InterfaceLoader for loading data into an interface type (#142)
Browse files Browse the repository at this point in the history
  • Loading branch information
austintaylor committed Aug 13, 2018
1 parent 309b089 commit 08e5aea
Show file tree
Hide file tree
Showing 2 changed files with 44 additions and 2 deletions.
24 changes: 22 additions & 2 deletions load.go
Expand Up @@ -5,6 +5,15 @@ import (
"reflect"
)

type interfaceLoader struct {
v interface{}
typ reflect.Type
}

func InterfaceLoader(value interface{}, concreteType interface{}) interface{} {
return interfaceLoader{value, reflect.TypeOf(concreteType)}
}

// Load loads any value from sql.Rows.
//
// value can be:
Expand All @@ -28,7 +37,16 @@ func Load(rows *sql.Rows, value interface{}) (int, error) {
}
ptr := make([]interface{}, len(column))

v := reflect.ValueOf(value)
var v reflect.Value
var elemType reflect.Type

if il, ok := value.(interfaceLoader); ok {
v = reflect.ValueOf(il.v)
elemType = il.typ
} else {
v = reflect.ValueOf(value)
}

if v.Kind() != reflect.Ptr || v.IsNil() {
return 0, ErrInvalidPointer
}
Expand All @@ -46,7 +64,9 @@ func Load(rows *sql.Rows, value interface{}) (int, error) {
for rows.Next() {
var elem, keyElem reflect.Value

if isMapOfSlices {
if elemType != nil {
elem = reflectAlloc(elemType)
} else if isMapOfSlices {
elem = reflectAlloc(v.Type().Elem().Elem())
} else if isSlice || isMap {
elem = reflectAlloc(v.Type().Elem())
Expand Down
22 changes: 22 additions & 0 deletions select_test.go
Expand Up @@ -117,6 +117,28 @@ func TestMaps(t *testing.T) {
}
}

func TestInterfaceLoader(t *testing.T) {
for _, sess := range testSession {
reset(t, sess)

_, err := sess.InsertInto("dbr_people").
Columns("name", "email").
Values("test1", "test1@test.com").
Values("test2", "test2@test.com").
Values("test2", "test3@test.com").
Exec()

var m []interface{}
cnt, err := sess.Select("*").From("dbr_people").Load(InterfaceLoader(&m, dbrPerson{}))
require.NoError(t, err)
require.Equal(t, 3, cnt)
require.Len(t, m, 3)
person, ok := m[0].(dbrPerson)
require.True(t, ok)
require.Equal(t, "test1", person.Name)
}
}

func TestPostgresArray(t *testing.T) {
sess := postgresSession
for _, v := range []string{
Expand Down

0 comments on commit 08e5aea

Please sign in to comment.