Fixing Columns and ColumnValues.

util/sqlgen/column_test.go

@@ -16,25 +16,3 @@ func TestColumnString(t *testing.T) {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
 	}
 }
-
-func TestColumns(t *testing.T) {
-	var s, e string
-
-	columns := Columns{
-		[]Column{
-			{"id"},
-			{"customer"},
-			{"service_id"},
-			{"role.name"},
-			{"role.id"},
-		},
-	}
-
-	s = columns.String()
-	e = `"id", "customer", "service_id", "role"."name", "role"."id"`
-
-	if s != e {
-		t.Fatalf("Got: %s, Expecting: %s", s, e)
-	}
-
-}

util/sqlgen/column_value.go

@@ -14,15 +14,15 @@ func (self ColumnValue) String() string {
 	return mustParse(sqlColumnValue, self)
 }
 
-type ColumnValues struct {
-	v []ColumnValue
-}
+type ColumnValues []ColumnValue
 
 func (self ColumnValues) String() string {
-	out := make([]string, len(self.v))
+	l := len(self)
+
+	out := make([]string, l)
 
-	for i := range self.v {
-		out[i] = self.v[i].String()
+	for i := 0; i < l; i++ {
+		out[i] = self[i].String()
 	}
 
 	return strings.Join(out, sqlColumnComma)

util/sqlgen/column_value_test.go

@@ -32,13 +32,11 @@ func TestColumnValues(t *testing.T) {
 	var cvs ColumnValues
 
 	cvs = ColumnValues{
-		[]ColumnValue{
 		{Column{"id"}, ">", Value{8}},
 		{Column{"other.id"}, "<", Value{Raw{"100"}}},
 		{Column{"name"}, "=", Value{"Haruki Murakami"}},
 		{Column{"created"}, ">=", Value{Raw{"NOW()"}}},
 		{Column{"modified"}, "<=", Value{Raw{"NOW()"}}},
-		},
 	}
 
 	s = cvs.String()

util/sqlgen/columns.go

@@ -4,16 +4,16 @@ import (
 	"strings"
 )
 
-type Columns struct {
-	v []Column
-}
+type Columns []Column
 
 func (self Columns) String() string {
-	if len(self.v) > 0 {
-		out := make([]string, len(self.v))
+	l := len(self)
+
+	if l > 0 {
+		out := make([]string, l)
 
-		for i := range self.v {
-			out[i] = self.v[i].String()
+		for i := 0; i < l; i++ {
+			out[i] = self[i].String()
 		}
 
 		return strings.Join(out, sqlColumnComma)
@@ -22,5 +22,5 @@ func (self Columns) String() string {
 }
 
 func (self Columns) Len() int {
-	return len(self.v)
+	return len(self)
 }

util/sqlgen/columns_test.go

+package sqlgen
+
+import (
+	"testing"
+)
+
+func TestColumns(t *testing.T) {
+	var s, e string
+
+	columns := Columns{
+		{"id"},
+		{"customer"},
+		{"service_id"},
+		{"role.name"},
+		{"role.id"},
+	}
+
+	s = columns.String()
+	e = `"id", "customer", "service_id", "role"."name", "role"."id"`
+
+	if s != e {
+		t.Fatalf("Got: %s, Expecting: %s", s, e)
+	}
+
+}

util/sqlgen/main_test.go

 package sqlgen
 
 import (
-	"regexp"
 	"strings"
 	"testing"
 )
 
-var reInvisible = regexp.MustCompile(`[\t\n\r]`)
-var reSpace = regexp.MustCompile(`\s+`)
-
-func trim(a string) string {
-	a = reInvisible.ReplaceAllString(strings.TrimSpace(a), " ")
-	a = reSpace.ReplaceAllString(strings.TrimSpace(a), " ")
-	return a
-}
-
 func TestTruncateTable(t *testing.T) {
 	var s, e string
 	var stmt Statement
@@ -127,12 +117,10 @@ func TestSelectFieldsFrom(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Source: Source{"source name"},
 	}
 
@@ -152,12 +140,10 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Limit:  42,
 		Source: Source{"source name"},
 	}
@@ -173,12 +159,10 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Offset: 17,
 		Source: Source{"source name"},
 	}
@@ -194,12 +178,10 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Limit:  42,
 		Offset: 17,
 		Source: Source{"source name"},
@@ -221,19 +203,15 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		OrderBy: OrderBy{
 			Columns: Columns{
-				[]Column{
 				{"foo"},
 			},
 		},
-		},
 		Source: Source{"source name"},
 	}
 
@@ -248,18 +226,14 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		OrderBy: OrderBy{
 			Columns: Columns{
-				[]Column{
 				{"foo"},
 			},
-			},
 			Sort: Sort{SqlSortAsc},
 		},
 		Source: Source{"source name"},
@@ -276,18 +250,14 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		OrderBy: OrderBy{
 			Columns: Columns{
-				[]Column{
 				{"foo"},
 			},
-			},
 			Sort: Sort{SqlSortDesc},
 		},
 		Source: Source{"source name"},
@@ -308,12 +278,10 @@ func TestSelectFieldsFromWhere(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Source: Source{"source name"},
 		Where: Where{
 			ColumnValue{Column{"baz"}, "=", Value{99}},
@@ -335,12 +303,10 @@ func TestSelectFieldsFromWhereLimitOffset(t *testing.T) {
 	stmt = Statement{
 		Type: SqlSelect,
 		Columns: Columns{
-			[]Column{
 			{"foo"},
 			{"bar"},
 			{"baz"},
 		},
-		},
 		Source: Source{"source name"},
 		Where: Where{
 			ColumnValue{Column{"baz"}, "=", Value{99}},
@@ -385,10 +351,8 @@ func TestUpdate(t *testing.T) {
 		Type:   SqlUpdate,
 		Source: Source{"source name"},
 		ColumnValues: ColumnValues{
-			[]ColumnValue{
 			{Column{"foo"}, "=", Value{76}},
 		},
-		},
 		Where: Where{
 			ColumnValue{Column{"baz"}, "=", Value{99}},
 		},
@@ -405,11 +369,9 @@ func TestUpdate(t *testing.T) {
 		Type:   SqlUpdate,
 		Source: Source{"source name"},
 		ColumnValues: ColumnValues{
-			[]ColumnValue{
 			{Column{"foo"}, "=", Value{76}},
 			{Column{"bar"}, "=", Value{Raw{"88"}}},
 		},
-		},
 		Where: Where{
 			ColumnValue{Column{"baz"}, "=", Value{99}},
 		},
@@ -431,12 +393,10 @@ func TestInsert(t *testing.T) {
 		Type:   SqlInsert,
 		Source: Source{"source name"},
 		Columns: Columns{
-			[]Column{
 			Column{"foo"},
 			Column{"bar"},
 			Column{"baz"},
 		},
-		},
 		Values: Values{
 			Value{"1"},
 			Value{2},

util/sqlgen/util_test.go

+package sqlgen
+
+import (
+	"regexp"
+	"strings"
+)
+
+var (
+	reInvisible = regexp.MustCompile(`[\t\n\r]`)
+	reSpace     = regexp.MustCompile(`\s+`)
+)
+
+func trim(a string) string {
+	a = reInvisible.ReplaceAllString(strings.TrimSpace(a), " ")
+	a = reSpace.ReplaceAllString(strings.TrimSpace(a), " ")
+	return a
+}