sql: rename Field to Column. (#100)

A Field would mean a cell in a row, but our previous Field type is actually a column definition in a schema, so Column is a more previse name.

Author: smola

git/blobs.go

@@ -25,8 +25,8 @@ func (blobsTable) Name() string {
 
 func (blobsTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"hash", sql.String},
-sql.Field{"size", sql.BigInteger},
+sql.Column{"hash", sql.String},
+sql.Column{"size", sql.BigInteger},
 }
 }
 

git/commits.go

@@ -25,14 +25,14 @@ func (commitsTable) Name() string {
 
 func (commitsTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"hash", sql.String},
-sql.Field{"author_name", sql.String},
-sql.Field{"author_email", sql.String},
-sql.Field{"author_when", sql.TimestampWithTimezone},
-sql.Field{"comitter_name", sql.String},
-sql.Field{"comitter_email", sql.String},
-sql.Field{"comitter_when", sql.TimestampWithTimezone},
-sql.Field{"message", sql.String},
+sql.Column{"hash", sql.String},
+sql.Column{"author_name", sql.String},
+sql.Column{"author_email", sql.String},
+sql.Column{"author_when", sql.TimestampWithTimezone},
+sql.Column{"comitter_name", sql.String},
+sql.Column{"comitter_email", sql.String},
+sql.Column{"comitter_when", sql.TimestampWithTimezone},
+sql.Column{"message", sql.String},
 }
 }
 

git/objects.go

@@ -25,8 +25,8 @@ func (objectsTable) Name() string {
 
 func (objectsTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"id", sql.String},
-sql.Field{"type", sql.String},
+sql.Column{"id", sql.String},
+sql.Column{"type", sql.String},
 }
 }
 

git/references.go

@@ -26,13 +26,13 @@ func (referencesTable) Name() string {
 
 func (referencesTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"hash", sql.String},
-sql.Field{"name", sql.String},
-sql.Field{"is_branch", sql.Boolean},
-sql.Field{"is_note", sql.Boolean},
-sql.Field{"is_remote", sql.Boolean},
-sql.Field{"is_tag", sql.Boolean},
-sql.Field{"target", sql.String},
+sql.Column{"hash", sql.String},
+sql.Column{"name", sql.String},
+sql.Column{"is_branch", sql.Boolean},
+sql.Column{"is_note", sql.Boolean},
+sql.Column{"is_remote", sql.Boolean},
+sql.Column{"is_tag", sql.Boolean},
+sql.Column{"target", sql.String},
 }
 }
 

git/tags.go

@@ -25,13 +25,13 @@ func (tagsTable) Name() string {
 
 func (tagsTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"hash", sql.String},
-sql.Field{"name", sql.String},
-sql.Field{"tagger_email", sql.String},
-sql.Field{"tagger_name", sql.String},
-sql.Field{"tagger_when", sql.TimestampWithTimezone},
-sql.Field{"message", sql.String},
-sql.Field{"target", sql.String},
+sql.Column{"hash", sql.String},
+sql.Column{"name", sql.String},
+sql.Column{"tagger_email", sql.String},
+sql.Column{"tagger_name", sql.String},
+sql.Column{"tagger_when", sql.TimestampWithTimezone},
+sql.Column{"message", sql.String},
+sql.Column{"target", sql.String},
 }
 }
 

git/tree_entries.go

@@ -27,10 +27,10 @@ func (treeEntriesTable) Name() string {
 
 func (treeEntriesTable) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{"tree_hash", sql.String},
-sql.Field{"entry_hash", sql.String},
-sql.Field{"mode", sql.String},
-sql.Field{"name", sql.String},
+sql.Column{"tree_hash", sql.String},
+sql.Column{"entry_hash", sql.String},
+sql.Column{"mode", sql.String},
+sql.Column{"name", sql.String},
 }
 }
 

mem/table_test.go

@@ -11,7 +11,7 @@ import (
 func TestTable_Name(t *testing.T) {
 assert := assert.New(t)
 s := sql.Schema{
-sql.Field{"col1", sql.String},
+sql.Column{"col1", sql.String},
 }
 table := NewTable("test", s)
 assert.Equal("test", table.Name())
@@ -20,7 +20,7 @@ func TestTable_Name(t *testing.T) {
 func TestTable_Insert_RowIter(t *testing.T) {
 assert := assert.New(t)
 s := sql.Schema{
-sql.Field{"col1", sql.String},
+sql.Column{"col1", sql.String},
 }
 
 table := NewTable("test", s)

sql/plan/cross_join_test.go

@@ -11,31 +11,31 @@ import (
 )
 
 var lSchema = sql.Schema{
-sql.Field{"lcol1", sql.String},
-sql.Field{"lcol2", sql.String},
-sql.Field{"lcol3", sql.Integer},
-sql.Field{"lcol4", sql.BigInteger},
+sql.Column{"lcol1", sql.String},
+sql.Column{"lcol2", sql.String},
+sql.Column{"lcol3", sql.Integer},
+sql.Column{"lcol4", sql.BigInteger},
 }
 
 var rSchema = sql.Schema{
-sql.Field{"rcol1", sql.String},
-sql.Field{"rcol2", sql.String},
-sql.Field{"rcol3", sql.Integer},
-sql.Field{"rcol4", sql.BigInteger},
+sql.Column{"rcol1", sql.String},
+sql.Column{"rcol2", sql.String},
+sql.Column{"rcol3", sql.Integer},
+sql.Column{"rcol4", sql.BigInteger},
 }
 
 func TestCrossJoin(t *testing.T) {
 assert := assert.New(t)
 
 resultSchema := sql.Schema{
-sql.Field{"lcol1", sql.String},
-sql.Field{"lcol2", sql.String},
-sql.Field{"lcol3", sql.Integer},
-sql.Field{"lcol4", sql.BigInteger},
-sql.Field{"rcol1", sql.String},
-sql.Field{"rcol2", sql.String},
-sql.Field{"rcol3", sql.Integer},
-sql.Field{"rcol4", sql.BigInteger},
+sql.Column{"lcol1", sql.String},
+sql.Column{"lcol2", sql.String},
+sql.Column{"lcol3", sql.Integer},
+sql.Column{"lcol4", sql.BigInteger},
+sql.Column{"rcol1", sql.String},
+sql.Column{"rcol2", sql.String},
+sql.Column{"rcol3", sql.Integer},
+sql.Column{"rcol4", sql.BigInteger},
 }
 
 ltable := mem.NewTable("left", lSchema)

sql/plan/describe.go

@@ -16,11 +16,11 @@ func NewDescribe(child sql.Node) *Describe {
 
 func (d *Describe) Schema() sql.Schema {
 return sql.Schema{
-sql.Field{
+sql.Column{
 Name: "name",
 Type: sql.String,
 },
-sql.Field{
+sql.Column{
 Name: "type",
 Type: sql.String,
 },

sql/plan/describe_test.go

@@ -13,8 +13,8 @@ func TestDescribe(t *testing.T) {
 assert := assert.New(t)
 
 table := mem.NewTable("test", sql.Schema{
-sql.Field{Name: "c1", Type: sql.String},
-sql.Field{Name: "c2", Type: sql.Integer},
+sql.Column{Name: "c1", Type: sql.String},
+sql.Column{Name: "c2", Type: sql.Integer},
 })
 
 d := NewDescribe(table)