From e8490b842e6ac629657822e3719a08ea747905ac Mon Sep 17 00:00:00 2001
From: Philip O'Toole <philip.otoole@yahoo.com>
Date: Sat, 20 Feb 2016 17:31:24 -0800
Subject: [PATCH] Query in db package almost there

It's the handling of the types, and ensuring they can be cast correctly,
which is what is next.
---
 db/db.go | 38 +++++++++++++++++++++++++++++++++-----
 1 file changed, 33 insertions(+), 5 deletions(-)

diff --git a/db/db.go b/db/db.go
index 81187f83..9f63acb9 100644
--- a/db/db.go
+++ b/db/db.go
@@ -12,8 +12,10 @@ type DB struct {
 }
 
 type Result sql.Result
-type Row sql.Row
-type Rows sql.Rows
+type Rows struct {
+	Columns []string
+	Values  [][]interface{}
+}
 
 // Open an existing database, creating it if it does not exist.
 func Open(dbPath string) (*DB, error) {
@@ -66,12 +68,12 @@ func (db *DB) Execute(queries []string, tx bool) ([]sql.Result, error) {
 	return nil, err
 }
 
-func (db *DB) Query(queries []string, tx bool) ([]*sql.Rows, error) {
+func (db *DB) Query(queries []string, tx bool) ([]Rows, error) {
 	type Queryer interface {
 		Query(query string, args ...interface{}) (*sql.Rows, error)
 	}
 
-	var allRows []*sql.Rows
+	var allRows []Rows
 	err := func() (err error) {
 		var queryer Queryer
 		defer func() {
@@ -91,12 +93,38 @@ func (db *DB) Query(queries []string, tx bool) ([]*sql.Rows, error) {
 		}
 
 		for _, q := range queries {
-			rows, err := queryer.Query(q)
+			rs, err := queryer.Query(q)
+			if err != nil {
+				return err
+			}
+			defer rs.Close() // This adds to all defers, right? Nothing leaks? XXX Could consume memory. Perhaps anon would be best.
+			columns, err := rs.Columns()
 			if err != nil {
 				return err
 			}
+
+			var rows Rows
+			rows.Columns = columns
+			for rs.Next() {
+				values := make([]interface{}, len(rows.Columns))
+				rawResult := make([]interface{}, len(columns))
+				for i := range rawResult {
+					values[i] = &rawResult[i]
+				}
+
+				err = rs.Scan(values...)
+				if err != nil {
+					return err
+				}
+				rows.Values = append(rows.Values, values)
+
+				// I think there is way to fix all this. The Values are *interface{}, but I want interface{} to go up,
+				// with the right types inside. http://stackoverflow.com/questions/23507531/is-golangs-sql-package-incapable-of-ad-hoc-exploratory-queries
+			}
+
 			allRows = append(allRows, rows)
 		}
+
 		return nil
 	}()