Add bug fix from 'dev'

Author: aarondl

queries/reflect.go

@@ -221,6 +221,7 @@ func bind(rows *sql.Rows, obj interface{}, structType, sliceType reflect.Type, b
 	}
 
 	foundOne := false
+Rows:
 	for rows.Next() {
 		foundOne = true
 		var newStruct reflect.Value
@@ -244,6 +245,8 @@ func bind(rows *sql.Rows, obj interface{}, structType, sliceType reflect.Type, b
 		}
 
 		switch bkind {
+		case kindStruct:
+			break Rows
 		case kindSliceStruct:
 			ptrSlice.Set(reflect.Append(ptrSlice, oneStruct))
 		case kindPtrSliceStruct:

queries/reflect_test.go

@@ -53,6 +53,7 @@ func TestBindStruct(t *testing.T) {
 
 	ret := sqlmock.NewRows([]string{"id", "test"})
 	ret.AddRow(driver.Value(int64(35)), driver.Value("pat"))
+	ret.AddRow(driver.Value(int64(65)), driver.Value("hat"))
 	mock.ExpectQuery(`SELECT \* FROM "fun";`).WillReturnRows(ret)
 
 	SetExecutor(query, db)