Refactor.

util/sqlgen/column.go

@@ -12,7 +12,7 @@ func (self Column) String() string {
 	chunks := strings.Split(self.v, sqlColumnSeparator)
 
 	for i := range chunks {
-		chunks[i] = mustParse(sqlEscape, Raw{chunks[i]})
+		chunks[i] = mustParse(sqlIdentifierQuote, Raw{chunks[i]})
 	}
 
 	return strings.Join(chunks, sqlColumnSeparator)

util/sqlgen/column_value.go

@@ -25,5 +25,5 @@ func (self ColumnValues) String() string {
 		out[i] = self[i].String()
 	}
 
-	return strings.Join(out, sqlColumnComma)
+	return strings.Join(out, sqlIdentifierSeparator)
 }

util/sqlgen/column_value_test.go

@@ -11,7 +11,7 @@ func TestColumnValue(t *testing.T) {
 	cv = ColumnValue{Column{"id"}, "=", Value{1}}
 
 	s = cv.String()
-	e = `"id" = "1"`
+	e = `"id" = '1'`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -40,7 +40,7 @@ func TestColumnValues(t *testing.T) {
 	}
 
 	s = cvs.String()
-	e = `"id" > "8", "other"."id" < 100, "name" = "Haruki Murakami", "created" >= NOW(), "modified" <= NOW()`
+	e = `"id" > '8', "other"."id" < 100, "name" = 'Haruki Murakami', "created" >= NOW(), "modified" <= NOW()`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)

util/sqlgen/columns.go

@@ -16,7 +16,7 @@ func (self Columns) String() string {
 			out[i] = self[i].String()
 		}
 
-		return strings.Join(out, sqlColumnComma)
+		return strings.Join(out, sqlIdentifierSeparator)
 	}
 	return ""
 }

util/sqlgen/database.go

@@ -9,5 +9,5 @@ type Database struct {
 }
 
 func (self Database) String() string {
-	return mustParse(sqlEscape, Raw{fmt.Sprintf(`%v`, self.v)})
+	return mustParse(sqlIdentifierQuote, Raw{fmt.Sprintf(`%v`, self.v)})
 }

util/sqlgen/main.go

@@ -2,21 +2,38 @@ package sqlgen
 
 import (
 	"bytes"
-	"fmt"
 	"text/template"
 )
 
 const (
 	sqlColumnSeparator     = `.`
-	sqlColumnComma     = `, `
-	sqlValueComma      = `, `
-	sqlEscape          = `"{{.Raw}}"`
+	sqlIdentifierSeparator = `, `
+	sqlIdentifierQuote     = `"{{.Raw}}"`
+	sqlValueSeparator      = `, `
+	sqlValueQuote          = `'{{.}}'`
+
+	sqlAndKeyword      = `AND`
+	sqlOrKeyword       = `OR`
+	sqlNotKeyword      = `NOT`
+	sqlDescKeyword     = `DESC`
+	sqlAscKeyword      = `ASC`
+	sqlDefaultOperator = `=`
+	sqlClauseGroup     = `({{.}})`
+	sqlClauseOperator  = ` {{.}} `
+	sqlColumnValue     = `{{.Column}} {{.Operator}} {{.Value}}`
 
 	sqlOrderByLayout = `
 		{{if .Columns}}
 			ORDER BY {{.Columns}} {{.Sort}}
 		{{end}}
 	`
+
+	sqlWhereLayout = `
+		{{if .Conds}}
+			WHERE {{.Conds}}
+		{{end}}
+	`
+
 	sqlSelectLayout = `
 		SELECT
 
@@ -28,9 +45,7 @@ const (
 
 			FROM {{.Table}}
 
-			{{if .Where}}
-				WHERE {{.Where}}
-			{{end}}
+			{{.Where}}
 
 			{{.OrderBy}}
 
@@ -45,26 +60,20 @@ const (
 	sqlDeleteLayout = `
 		DELETE
 			FROM {{.Table}}
-			{{if .Where}}
-				WHERE {{.Where}}
-			{{end}}
+			{{.Where}}
 	`
 	sqlUpdateLayout = `
 		UPDATE
 			{{.Table}}
 		SET {{.ColumnValues}}
-			{{if .Where}}
-				WHERE {{.Where}}
-			{{end}}
+			{{ .Where }}
 	`
 
 	sqlSelectCountLayout = `
 		SELECT
 			COUNT(1) AS _t
 		FROM {{.Table}}
-			{{if .Where}}
-				WHERE {{.Where}}
-			{{end}}
+			{{.Where}}
 	`
 
 	sqlInsertLayout = `
@@ -85,15 +94,6 @@ const (
 	sqlDropTableLayout = `
 		DROP TABLE {{.Table}}
 	`
-
-	sqlAndKeyword      = `AND`
-	sqlOrKeyword       = `OR`
-	sqlDescKeyword     = `DESC`
-	sqlAscKeyword      = `ASC`
-	sqlDefaultOperator = `=`
-	sqlConditionGroup  = `({{.}})`
-
-	sqlColumnValue = `{{.Column}} {{.Operator}} {{.Value}}`
 )
 
 type Type uint
@@ -120,7 +120,6 @@ func mustParse(text string, data interface{}) string {
 	t := template.Must(template.New("").Parse(text))
 
 	if err := t.Execute(&b, data); err != nil {
-		fmt.Printf("data: %v\n", data)
 		panic("t.Execute: " + err.Error())
 	}
 

util/sqlgen/main_test.go

@@ -110,6 +110,26 @@ func TestSelectStarFrom(t *testing.T) {
 	}
 }
 
+func TestSelectArtistNameFrom(t *testing.T) {
+	var s, e string
+	var stmt Statement
+
+	stmt = Statement{
+		Type:  SqlSelect,
+		Table: Table{"artist"},
+		Columns: Columns{
+			Column{"artist.name"},
+		},
+	}
+
+	s = trim(stmt.Compile())
+	e = `SELECT "artist"."name" FROM "artist"`
+
+	if s != e {
+		t.Fatalf("Got: %s, Expecting: %s", s, e)
+	}
+}
+
 func TestSelectFieldsFrom(t *testing.T) {
 	var s, e string
 	var stmt Statement
@@ -289,7 +309,7 @@ func TestSelectFieldsFromWhere(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `SELECT "foo", "bar", "baz" FROM "table name" WHERE ("baz" = "99")`
+	e = `SELECT "foo", "bar", "baz" FROM "table name" WHERE ("baz" = '99')`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -316,7 +336,7 @@ func TestSelectFieldsFromWhereLimitOffset(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `SELECT "foo", "bar", "baz" FROM "table name" WHERE ("baz" = "99") LIMIT 10 OFFSET 23`
+	e = `SELECT "foo", "bar", "baz" FROM "table name" WHERE ("baz" = '99') LIMIT 10 OFFSET 23`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -336,7 +356,7 @@ func TestDelete(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `DELETE FROM "table name" WHERE ("baz" = "99")`
+	e = `DELETE FROM "table name" WHERE ("baz" = '99')`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -359,7 +379,7 @@ func TestUpdate(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `UPDATE "table name" SET "foo" = "76" WHERE ("baz" = "99")`
+	e = `UPDATE "table name" SET "foo" = '76' WHERE ("baz" = '99')`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -378,7 +398,7 @@ func TestUpdate(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `UPDATE "table name" SET "foo" = "76", "bar" = 88 WHERE ("baz" = "99")`
+	e = `UPDATE "table name" SET "foo" = '76', "bar" = 88 WHERE ("baz" = '99')`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -405,7 +425,7 @@ func TestInsert(t *testing.T) {
 	}
 
 	s = trim(stmt.Compile())
-	e = `INSERT INTO "table name" ("foo", "bar", "baz") VALUES ("1", "2", 3)`
+	e = `INSERT INTO "table name" ("foo", "bar", "baz") VALUES ('1', '2', 3)`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)

util/sqlgen/table.go

@@ -9,5 +9,5 @@ type Table struct {
 }
 
 func (self Table) String() string {
-	return mustParse(sqlEscape, Raw{fmt.Sprintf(`%v`, self.v)})
+	return mustParse(sqlIdentifierQuote, Raw{fmt.Sprintf(`%v`, self.v)})
 }

util/sqlgen/value.go

@@ -15,8 +15,7 @@ func (self Value) String() string {
 	if raw, ok := self.v.(Raw); ok {
 		return raw.Raw
 	}
-
-	return mustParse(sqlEscape, Raw{fmt.Sprintf(`%v`, self.v)})
+	return mustParse(sqlValueQuote, Raw{fmt.Sprintf(`%v`, self.v)})
 }
 
 func (self Values) String() string {
@@ -29,7 +28,7 @@ func (self Values) String() string {
 			chunks = append(chunks, self[i].String())
 		}
 
-		return strings.Join(chunks, sqlValueComma)
+		return strings.Join(chunks, sqlValueSeparator)
 	}
 
 	return ""

util/sqlgen/value_test.go

@@ -11,7 +11,7 @@ func TestValue(t *testing.T) {
 	val = Value{1}
 
 	s = val.String()
-	e = `"1"`
+	e = `'1'`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -38,7 +38,7 @@ func TestValues(t *testing.T) {
 	}
 
 	s = val.String()
-	e = `1, 2, "3"`
+	e = `1, 2, '3'`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)

util/sqlgen/where.go

@@ -10,16 +10,24 @@ type (
 	Where []interface{}
 )
 
+type conds struct {
+	Conds string
+}
+
 func (self Or) String() string {
-	return groupCondition(self, sqlOrKeyword)
+	return groupCondition(self, mustParse(sqlClauseOperator, sqlOrKeyword))
 }
 
 func (self And) String() string {
-	return groupCondition(self, sqlAndKeyword)
+	return groupCondition(self, mustParse(sqlClauseOperator, sqlAndKeyword))
 }
 
 func (self Where) String() string {
-	return groupCondition(self, sqlAndKeyword)
+	grouped := groupCondition(self, mustParse(sqlClauseOperator, sqlAndKeyword))
+	if grouped != "" {
+		return mustParse(sqlWhereLayout, conds{grouped})
+	}
+	return ""
 }
 
 func groupCondition(terms []interface{}, joinKeyword string) string {
@@ -44,7 +52,7 @@ func groupCondition(terms []interface{}, joinKeyword string) string {
 	}
 
 	if len(chunks) > 0 {
-		return mustParse(sqlConditionGroup, strings.Join(chunks, " "+joinKeyword+" "))
+		return mustParse(sqlClauseGroup, strings.Join(chunks, joinKeyword))
 	}
 
 	return ""

util/sqlgen/where_test.go

@@ -15,7 +15,7 @@ func TestWhereAnd(t *testing.T) {
 	}
 
 	s = and.String()
-	e = `("id" > 8 AND "id" < 99 AND "name" = "John")`
+	e = `("id" > 8 AND "id" < 99 AND "name" = 'John')`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -54,7 +54,7 @@ func TestWhereAndOr(t *testing.T) {
 	}
 
 	s = and.String()
-	e = `("id" > 8 AND "id" < 99 AND "name" = "John" AND ("last_name" = "Smith" OR "last_name" = "Reyes"))`
+	e = `("id" > 8 AND "id" < 99 AND "name" = 'John' AND ("last_name" = 'Smith' OR "last_name" = 'Reyes'))`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -82,8 +82,8 @@ func TestWhereAndRawOrAnd(t *testing.T) {
 		},
 	}
 
-	s = where.String()
-	e = `(("id" > 8 AND "id" < 99) AND "name" = "John" AND city_id = 728 AND ("last_name" = "Smith" OR "last_name" = "Reyes") AND ("age" > 18 AND "age" < 41))`
+	s = trim(where.String())
+	e = `WHERE (("id" > 8 AND "id" < 99) AND "name" = 'John' AND city_id = 728 AND ("last_name" = 'Smith' OR "last_name" = 'Reyes') AND ("age" > 18 AND "age" < 41))`
 
 	if s != e {
 		t.Fatalf("Got: %s, Expecting: %s", s, e)