sql: make Row a concrete implementation. (#96)

* Row is now a slice instead of an interface.
* MemoryRow is removed.

Author: smola

cmd/gitql/query.go

@@ -114,7 +114,12 @@ func (c *CmdQuery) printQuery(schema sql.Schema, iter sql.RowIter) error {
 			return err
 		}
 
-		if err := f.Write(row.Fields()); err != nil {
+		record := make([]interface{}, len(row))
+		for i := 0; i < len(row); i++ {
+			record[i] = row[i]
+		}
+
+		if err := f.Write(record); err != nil {
 			return err
 		}
 	}

engine.go

@@ -3,8 +3,8 @@ package gitql
 import (
 	"github.com/gitql/gitql/sql"
 	"github.com/gitql/gitql/sql/analyzer"
-	"github.com/gitql/gitql/sql/parse"
 	"github.com/gitql/gitql/sql/expression"
+	"github.com/gitql/gitql/sql/parse"
 )
 
 type Engine struct {

engine_test.go

@@ -16,46 +16,46 @@ func TestEngine_Query(t *testing.T) {
 	testQuery(t, e,
 		"SELECT i FROM mytable;",
 		[]sql.Row{
-			sql.NewMemoryRow(int64(1)),
-			sql.NewMemoryRow(int64(2)),
-			sql.NewMemoryRow(int64(3)),
+			sql.NewRow(int64(1)),
+			sql.NewRow(int64(2)),
+			sql.NewRow(int64(3)),
 		},
 	)
 
 	testQuery(t, e,
 		"SELECT i FROM mytable WHERE i = 2;",
 		[]sql.Row{
-			sql.NewMemoryRow(int64(2)),
+			sql.NewRow(int64(2)),
 		},
 	)
 
 	testQuery(t, e,
 		"SELECT i FROM mytable ORDER BY i DESC;",
 		[]sql.Row{
-			sql.NewMemoryRow(int64(3)),
-			sql.NewMemoryRow(int64(2)),
-			sql.NewMemoryRow(int64(1)),
+			sql.NewRow(int64(3)),
+			sql.NewRow(int64(2)),
+			sql.NewRow(int64(1)),
 		},
 	)
 
 	testQuery(t, e,
 		"SELECT i FROM mytable WHERE s = 'a' ORDER BY i DESC;",
 		[]sql.Row{
-			sql.NewMemoryRow(int64(1)),
+			sql.NewRow(int64(1)),
 		},
 	)
 
 	testQuery(t, e,
 		"SELECT i FROM mytable WHERE s = 'a' ORDER BY i DESC LIMIT 1;",
 		[]sql.Row{
-			sql.NewMemoryRow(int64(1)),
+			sql.NewRow(int64(1)),
 		},
 	)
 
 	testQuery(t, e,
 		"SELECT COUNT(*) FROM mytable;",
 		[]sql.Row{
-			sql.NewMemoryRow(int32(3)),
+			sql.NewRow(int32(3)),
 		},
 	)
 }
@@ -91,9 +91,9 @@ func newEngine(t *testing.T) *gitql.Engine {
 		{"i", sql.BigInteger},
 		{"s", sql.String},
 	})
-	assert.Nil(table.Insert(int64(1), "a"))
-	assert.Nil(table.Insert(int64(2), "b"))
-	assert.Nil(table.Insert(int64(3), "c"))
+	assert.Nil(table.Insert(sql.NewRow(int64(1), "a")))
+	assert.Nil(table.Insert(sql.NewRow(int64(2), "b")))
+	assert.Nil(table.Insert(sql.NewRow(int64(3), "c")))
 
 	db := mem.NewDatabase("mydb")
 	db.AddTable("mytable", table)

git/blobs.go

@@ -65,7 +65,7 @@ func (i *blobIter) Next() (sql.Row, error) {
 }
 
 func blobToRow(c *object.Blob) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		c.Hash.String(),
 		c.Size,
 	)

git/commits.go

@@ -70,7 +70,7 @@ func (i *commitIter) Next() (sql.Row, error) {
 }
 
 func commitToRow(c *object.Commit) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		c.Hash.String(),
 		c.Author.Name,
 		c.Author.Email,

git/objects.go

@@ -65,7 +65,7 @@ func (i *objectIter) Next() (sql.Row, error) {
 }
 
 func objectToRow(o object.Object) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		o.ID().String(),
 		o.Type().String(),
 	)

git/references.go

@@ -71,7 +71,7 @@ func (i *referenceIter) Next() (sql.Row, error) {
 }
 
 func referenceToRow(c *plumbing.Reference) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		c.Hash().String(),
 		c.Name().String(),
 		c.IsBranch(),

git/tags.go

@@ -70,7 +70,7 @@ func (i *tagIter) Next() (sql.Row, error) {
 }
 
 func tagToRow(c *object.Tag) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		c.Hash.String(),
 		c.Name,
 		c.Tagger.Email,

git/tree_entries.go

@@ -86,7 +86,7 @@ func (i *treeEntryIter) Next() (sql.Row, error) {
 }
 
 func treeEntryToRow(t *object.Tree, e object.TreeEntry) sql.Row {
-	return sql.NewMemoryRow(
+	return sql.NewRow(
 		t.ID().String(),
 		e.Hash.String(),
 		strconv.FormatInt(int64(e.Mode), 8),

internal/format/json_test.go

@@ -19,7 +19,6 @@ func TestNewJsonFormat(t *testing.T) {
 	}, w, t)
 }
 
-
 func TestNewFormat_Json(t *testing.T) {
 	testNewFormat("json", t)
-}
+}