From 70035a30ab6c0269aff1083f95652344c18f083f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Jos=C3=A9=20Carlos=20Nieto?= <jose.carlos@menteslibres.net>
Date: Sat, 7 Jun 2014 14:45:36 -0500
Subject: [PATCH] Using .Table instead of .Source.
---
util/sqlgen/main.go | 16 ++---
util/sqlgen/main_test.go | 96 ++++++++++++++---------------
util/sqlgen/{source.go => table.go} | 4 +-
3 files changed, 58 insertions(+), 58 deletions(-)
rename util/sqlgen/{source.go => table.go} (65%)
diff --git a/util/sqlgen/main.go b/util/sqlgen/main.go
index a67351bc..2d610f2b 100644
--- a/util/sqlgen/main.go
+++ b/util/sqlgen/main.go
@@ -26,7 +26,7 @@ const (
*
{{end}}
- FROM {{.Source}}
+ FROM {{.Table}}
{{if .Where}}
WHERE {{.Where}}
@@ -44,14 +44,14 @@ const (
`
sqlDeleteLayout = `
DELETE
- FROM {{.Source}}
+ FROM {{.Table}}
{{if .Where}}
WHERE {{.Where}}
{{end}}
`
sqlUpdateLayout = `
UPDATE
- {{.Source}}
+ {{.Table}}
SET {{.ColumnValues}}
{{if .Where}}
WHERE {{.Where}}
@@ -61,21 +61,21 @@ const (
sqlSelectCountLayout = `
SELECT
COUNT(1) AS _t
- FROM {{.Source}}
+ FROM {{.Table}}
{{if .Where}}
WHERE {{.Where}}
{{end}}
`
sqlInsertLayout = `
- INSERT INTO {{.Source}}
+ INSERT INTO {{.Table}}
({{.Columns}})
VALUES
({{.Values}})
`
sqlTruncateLayout = `
- TRUNCATE TABLE {{.Source}}
+ TRUNCATE TABLE {{.Table}}
`
sqlDropDatabaseLayout = `
@@ -83,7 +83,7 @@ const (
`
sqlDropTableLayout = `
- DROP TABLE {{.Source}}
+ DROP TABLE {{.Table}}
`
sqlAndKeyword = `AND`
@@ -129,7 +129,7 @@ func mustParse(text string, data interface{}) string {
type Statement struct {
Type
- Source
+ Table
Database
Limit
Offset
diff --git a/util/sqlgen/main_test.go b/util/sqlgen/main_test.go
index 97956d13..87892f41 100644
--- a/util/sqlgen/main_test.go
+++ b/util/sqlgen/main_test.go
@@ -10,12 +10,12 @@ func TestTruncateTable(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlTruncate,
- Source: Source{"source name"},
+ Type: SqlTruncate,
+ Table: Table{"table name"},
}
s = strings.TrimSpace(stmt.Compile())
- e = `TRUNCATE TABLE "source name"`
+ e = `TRUNCATE TABLE "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -27,12 +27,12 @@ func TestDropTable(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlDropTable,
- Source: Source{"source name"},
+ Type: SqlDropTable,
+ Table: Table{"table name"},
}
s = strings.TrimSpace(stmt.Compile())
- e = `DROP TABLE "source name"`
+ e = `DROP TABLE "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -45,11 +45,11 @@ func TestDropDatabase(t *testing.T) {
stmt = Statement{
Type: SqlDropDatabase,
- Database: Database{"source name"},
+ Database: Database{"table name"},
}
s = trim(stmt.Compile())
- e = `DROP DATABASE "source name"`
+ e = `DROP DATABASE "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -61,12 +61,12 @@ func TestSelectCount(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlSelectCount,
- Source: Source{"source name"},
+ Type: SqlSelectCount,
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT COUNT(1) AS _t FROM "source name"`
+ e = `SELECT COUNT(1) AS _t FROM "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -78,15 +78,15 @@ func TestSelectCountWhere(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlSelectCount,
- Source: Source{"source name"},
+ Type: SqlSelectCount,
+ Table: Table{"table name"},
Where: Where{
ColumnValue{Column{"a"}, "=", Value{Raw{"7"}}},
},
}
s = trim(stmt.Compile())
- e = `SELECT COUNT(1) AS _t FROM "source name" WHERE ("a" = 7)`
+ e = `SELECT COUNT(1) AS _t FROM "table name" WHERE ("a" = 7)`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -98,12 +98,12 @@ func TestSelectStarFrom(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlSelect,
- Source: Source{"source name"},
+ Type: SqlSelect,
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT * FROM "source name"`
+ e = `SELECT * FROM "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -121,11 +121,11 @@ func TestSelectFieldsFrom(t *testing.T) {
{"bar"},
{"baz"},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name"`
+ e = `SELECT "foo", "bar", "baz" FROM "table name"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -144,12 +144,12 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
{"bar"},
{"baz"},
},
- Limit: 42,
- Source: Source{"source name"},
+ Limit: 42,
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" LIMIT 42`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" LIMIT 42`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -164,11 +164,11 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
{"baz"},
},
Offset: 17,
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" OFFSET 17`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" OFFSET 17`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -184,11 +184,11 @@ func TestSelectFieldsFromWithLimitOffset(t *testing.T) {
},
Limit: 42,
Offset: 17,
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" LIMIT 42 OFFSET 17`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" LIMIT 42 OFFSET 17`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -212,11 +212,11 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
{"foo"},
},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" ORDER BY "foo"`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" ORDER BY "foo"`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -236,11 +236,11 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
},
Sort: Sort{SqlSortAsc},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" ORDER BY "foo" ASC`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" ORDER BY "foo" ASC`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -260,11 +260,11 @@ func TestSelectFieldsFromWithOrderBy(t *testing.T) {
},
Sort: Sort{SqlSortDesc},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source name" ORDER BY "foo" DESC`
+ e = `SELECT "foo", "bar", "baz" FROM "table name" ORDER BY "foo" DESC`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -282,14 +282,14 @@ func TestSelectFieldsFromWhere(t *testing.T) {
{"bar"},
{"baz"},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
Where: Where{
ColumnValue{Column{"baz"}, "=", Value{99}},
},
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source 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)
@@ -307,7 +307,7 @@ func TestSelectFieldsFromWhereLimitOffset(t *testing.T) {
{"bar"},
{"baz"},
},
- Source: Source{"source name"},
+ Table: Table{"table name"},
Where: Where{
ColumnValue{Column{"baz"}, "=", Value{99}},
},
@@ -316,7 +316,7 @@ func TestSelectFieldsFromWhereLimitOffset(t *testing.T) {
}
s = trim(stmt.Compile())
- e = `SELECT "foo", "bar", "baz" FROM "source 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)
@@ -328,15 +328,15 @@ func TestDelete(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlDelete,
- Source: Source{"source name"},
+ Type: SqlDelete,
+ Table: Table{"table name"},
Where: Where{
ColumnValue{Column{"baz"}, "=", Value{99}},
},
}
s = trim(stmt.Compile())
- e = `DELETE FROM "source name" WHERE ("baz" = "99")`
+ e = `DELETE FROM "table name" WHERE ("baz" = "99")`
if s != e {
t.Fatalf("Got: %s, Expecting: %s", s, e)
@@ -348,8 +348,8 @@ func TestUpdate(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlUpdate,
- Source: Source{"source name"},
+ Type: SqlUpdate,
+ Table: Table{"table name"},
ColumnValues: ColumnValues{
{Column{"foo"}, "=", Value{76}},
},
@@ -359,15 +359,15 @@ func TestUpdate(t *testing.T) {
}
s = trim(stmt.Compile())
- e = `UPDATE "source 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)
}
stmt = Statement{
- Type: SqlUpdate,
- Source: Source{"source name"},
+ Type: SqlUpdate,
+ Table: Table{"table name"},
ColumnValues: ColumnValues{
{Column{"foo"}, "=", Value{76}},
{Column{"bar"}, "=", Value{Raw{"88"}}},
@@ -378,7 +378,7 @@ func TestUpdate(t *testing.T) {
}
s = trim(stmt.Compile())
- e = `UPDATE "source 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)
@@ -390,8 +390,8 @@ func TestInsert(t *testing.T) {
var stmt Statement
stmt = Statement{
- Type: SqlInsert,
- Source: Source{"source name"},
+ Type: SqlInsert,
+ Table: Table{"table name"},
Columns: Columns{
Column{"foo"},
Column{"bar"},
@@ -405,7 +405,7 @@ func TestInsert(t *testing.T) {
}
s = trim(stmt.Compile())
- e = `INSERT INTO "source 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)
diff --git a/util/sqlgen/source.go b/util/sqlgen/table.go
similarity index 65%
rename from util/sqlgen/source.go
rename to util/sqlgen/table.go
index f095c25c..46720770 100644
--- a/util/sqlgen/source.go
+++ b/util/sqlgen/table.go
@@ -4,10 +4,10 @@ import (
"fmt"
)
-type Source struct {
+type Table struct {
v string
}
-func (self Source) String() string {
+func (self Table) String() string {
return mustParse(sqlEscape, Raw{fmt.Sprintf(`%v`, self.v)})
}
--
GitLab