|
|
@@ -9,7 +9,7 @@ import (
|
|
|
"time"
|
|
|
)
|
|
|
|
|
|
-type rowData struct {
|
|
|
+type RowData struct {
|
|
|
Columns []string
|
|
|
Values []interface{}
|
|
|
}
|
|
|
@@ -53,15 +53,15 @@ func dereference(i interface{}) interface{} {
|
|
|
return reflect.Indirect(reflect.ValueOf(i)).Interface()
|
|
|
}
|
|
|
|
|
|
-func (r *rowData) rowMap(m map[string]interface{}) {
|
|
|
+func (r *RowData) rowMap(m map[string]interface{}) {
|
|
|
for i, column := range r.Columns {
|
|
|
m[column] = dereference(r.Values[i])
|
|
|
}
|
|
|
}
|
|
|
|
|
|
-func (iter *Iter) rowData() (rowData, error) {
|
|
|
+func (iter *Iter) RowData() (RowData, error) {
|
|
|
if iter.err != nil {
|
|
|
- return rowData{}, iter.err
|
|
|
+ return RowData{}, iter.err
|
|
|
}
|
|
|
columns := make([]string, 0)
|
|
|
values := make([]interface{}, 0)
|
|
|
@@ -70,7 +70,7 @@ func (iter *Iter) rowData() (rowData, error) {
|
|
|
columns = append(columns, column.Name)
|
|
|
values = append(values, val)
|
|
|
}
|
|
|
- rowData := rowData{
|
|
|
+ rowData := RowData{
|
|
|
Columns: columns,
|
|
|
Values: values,
|
|
|
}
|
|
|
@@ -85,7 +85,7 @@ func (iter *Iter) SliceMap() ([]map[string]interface{}, error) {
|
|
|
}
|
|
|
|
|
|
// Not checking for the error because we just did
|
|
|
- rowData, _ := iter.rowData()
|
|
|
+ rowData, _ := iter.RowData()
|
|
|
dataToReturn := make([]map[string]interface{}, 0)
|
|
|
for iter.Scan(rowData.Values...) {
|
|
|
m := make(map[string]interface{})
|
|
|
@@ -106,7 +106,7 @@ func (iter *Iter) MapScan(m map[string]interface{}) bool {
|
|
|
}
|
|
|
|
|
|
// Not checking for the error because we just did
|
|
|
- rowData, _ := iter.rowData()
|
|
|
+ rowData, _ := iter.RowData()
|
|
|
|
|
|
if iter.Scan(rowData.Values...) {
|
|
|
rowData.rowMap(m)
|