Finish BindAll implementation

boil/query.go

@@ -148,7 +148,7 @@ func SetSelect(q *Query, columns ...string) {
 	q.selectCols = append(q.selectCols, columns...)
 }
 
-func GetSelect(q *Query) []string {
+func Select(q *Query) []string {
 	cols := make([]string, len(q.selectCols))
 	copy(cols, q.selectCols)
 	return cols

boil/reflect.go

@@ -57,25 +57,36 @@ func BindOne(row *sql.Row, selectCols []string, obj interface{}) error {
 // BindAll inserts the returned rows columns into the
 // passed in slice of object pointers
 func BindAll(rows *sql.Rows, selectCols []string, obj interface{}) error {
-	val := reflect.ValueOf(obj)
+	ptrSlice := reflect.ValueOf(obj)
-	typ := reflect.TypeOf(obj)
+	typ := ptrSlice.Type()
-	kind := val.Kind()
+	ptrSlice = ptrSlice.Elem()
+	kind := typ.Kind()
 
-	if kind != reflect.Slice {
+	var structTyp reflect.Type
-		return fmt.Errorf("BindAll given a non-slice type")
+
+	for i, exp := range []reflect.Kind{reflect.Ptr, reflect.Slice, reflect.Ptr, reflect.Struct} {
+		if i != 0 {
+			typ = typ.Elem()
+			kind = typ.Kind()
+		}
+
+		if kind != exp {
+			return fmt.Errorf("[%d] BindAll object type should be *[]*Type but was: %s", i, ptrSlice.Type().String())
+		}
+
+		if kind == reflect.Struct {
+			structTyp = typ
+		}
 	}
 
-	spare := reflect.New(typ.Elem().Elem())
+	newStruct := reflect.New(structTyp)
-	fmt.Printf("%T, %#v, %s\n", spare, spare, spare.Type().String())
-
-	index := 0
 	for rows.Next() {
-		val = reflect.Append(val, spare)
+		pointers := GetStructPointers(newStruct.Interface(), selectCols...)
-		pointers := GetStructPointers(val.Index(index), selectCols...)
 		if err := rows.Scan(pointers...); err != nil {
 			return fmt.Errorf("Unable to scan into pointers: %s", err)
 		}
-		index++
+
+		ptrSlice.Set(reflect.Append(ptrSlice, newStruct))
 	}
 
 	return nil
@@ -135,7 +146,18 @@ func GetStructValues(obj interface{}, columns ...string) []interface{} {
 // GetStructPointers returns a slice of pointers to the matching columns in obj
 func GetStructPointers(obj interface{}, columns ...string) []interface{} {
 	val := reflect.ValueOf(obj).Elem()
-	ret := make([]interface{}, len(columns))
+	var ret []interface{}
+
+	if len(columns) == 0 {
+		fieldsLen := val.NumField()
+		ret = make([]interface{}, fieldsLen)
+		for i := 0; i < fieldsLen; i++ {
+			ret[i] = val.Field(i).Addr().Interface()
+		}
+		return ret
+	}
+
+	ret = make([]interface{}, len(columns))
 
 	for i, c := range columns {
 		field := val.FieldByName(strmangle.TitleCase(c))

cmds/templates/finishers.tpl

@@ -8,7 +8,7 @@ func (q {{$varNameSingular}}Query) One() (*{{$tableNameSingular}}, error) {
   boil.SetLimit(q.Query, 1)
 
   res := boil.ExecQueryOne(q.Query)
-  err := boil.BindOne(res, boil.GetSelect(q.Query), o)
+  err := boil.BindOne(res, boil.Select(q.Query), o)
   if err != nil {
     return nil, fmt.Errorf("{{.PkgName}}: failed to execute a one query for {{.Table.Name}}: %s", err)
   }
@@ -17,14 +17,14 @@ func (q {{$varNameSingular}}Query) One() (*{{$tableNameSingular}}, error) {
 }
 
 func (q {{$varNameSingular}}Query) All() ({{$varNameSingular}}Slice, error) {
-  var o *{{$varNameSingular}}Slice
+  var o {{$varNameSingular}}Slice
 
   res, err := boil.ExecQueryAll(q.Query)
   if err != nil {
     return nil, fmt.Errorf("{{.PkgName}}: failed to execute an all query for {{.Table.Name}}: %s", err)
   }
 
-  err = boil.BindAll(res, boil.GetSelect(q.Query), o)
+  err = boil.BindAll(res, boil.Select(q.Query), &o)
   if err != nil {
     return nil, fmt.Errorf("{{.PkgName}}: failed to assign all query results to {{$tableNameSingular}} slice: %s", err)
   }