make column methods pointers

Author: tmus

column/Binary.go

@@ -1,9 +1,9 @@
 package column
 
 // Binary creates a binary column.
-func Binary(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "binary",
+func Binary(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "binary",
 	}
 }

column/Boolean.go

@@ -1,9 +1,9 @@
 package column
 
 // Boolean returns a bool column.
-func Boolean(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "boolean",
+func Boolean(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "boolean",
 	}
 }

column/Char.go

@@ -1,9 +1,12 @@
 package column
 
 // Char returns a char column.
-func Char(name string, len int) Column {
-	return Column{
-		Name:   name,
-		Values: "char",
-	}.Length(len)
+func Char(name string, len int) *Column {
+	col := &Column{
+		Name:     name,
+		datatype: "char",
+	}
+
+	col.Length(len)
+	return col
 }

column/Column.go

@@ -13,7 +13,7 @@ type Columnable interface {
 // Column defines a single column on a database table.
 type Column struct {
 	Name         string
-	Values       string
+	datatype     string
 	increments   bool
 	primaryKey   bool
 	nullable     bool
@@ -27,9 +27,9 @@ func (c Column) ToSQL() string {
 	// TODO: Make this better. Really, all the "meta" info
 	// should be put into a slice and iterated through and
 	// appended to the "core" column data - the name and type.
-	sql := fmt.Sprintf("%s %s", c.Name, c.Values)
+	sql := fmt.Sprintf("%s %s", c.Name, c.datatype)
 	// TODO: Tidy this up.
-	if (c.Values == "string" || c.Values == "char") && c.length != 0 {
+	if (c.datatype == "string" || c.datatype == "char") && c.length != 0 {
 		sql = sql + fmt.Sprintf("(%d)", c.length)
 	}
 	if c.nullable == false {
@@ -97,7 +97,6 @@ func (c Column) Nullable() Column {
 // Length adds a length constraint to applicable columns.
 // TODO: Should this throw an error on columns that can't
 // have a length modifier? Like TEXT?
-func (c Column) Length(len int) Column {
+func (c *Column) Length(len int) {
 	c.length = len
-	return c
 }

column/Date.go

@@ -1,9 +1,9 @@
 package column
 
 // Date returns a date column.
-func Date(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "date",
+func Date(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "date",
 	}
 }

column/DateTime.go

@@ -1,9 +1,9 @@
 package column
 
 // DateTime returns a DateTime column.
-func DateTime(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "datetime",
+func DateTime(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "datetime",
 	}
 }

column/Int.go

@@ -2,9 +2,9 @@ package column
 
 // Int returns a column of type Int.
 // TODO: Add big int, tiny int, etc.
-func Int(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "integer",
+func Int(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "integer",
 	}
 }

column/String.go

@@ -1,9 +1,12 @@
 package column
 
 // String creates a column with a type of String.
-func String(name string, len int) Column {
-	return Column{
-		Name:   name,
-		Values: "varchar",
-	}.Length(len)
+func String(name string, len int) *Column {
+	col := &Column{
+		Name:     name,
+		datatype: "varchar",
+	}
+
+	col.Length(len)
+	return col
 }

column/Text.go

@@ -1,9 +1,9 @@
 package column
 
 // Text returns a column of type text.
-func Text(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "text",
+func Text(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "text",
 	}
 }

column/Time.go

@@ -1,9 +1,9 @@
 package column
 
 // Time returns a time column.
-func Time(name string) Column {
-	return Column{
-		Name:   name,
-		Values: "time",
+func Time(name string) *Column {
+	return &Column{
+		Name:     name,
+		datatype: "time",
 	}
 }