Alias issue go-rel#69

Author: fairking

builder/buffer.go

@@ -133,18 +133,22 @@ func (b Buffer) escape(table, value string) string {
 
 	var escaped_table string
 	if table != "" {
-		if i := strings.Index(strings.ToLower(table), " as "); i > -1 {
-			return b.escape(table[:i], "") + " AS " + b.Quoter.ID(table[i+4:])
-		}
 		if b.AllowTableSchema && strings.IndexByte(table, '.') >= 0 {
 			parts := strings.Split(table, ".")
 			for i, part := range parts {
 				part = strings.TrimSpace(part)
 				parts[i] = b.Quoter.ID(part)
 			}
 			escaped_table = strings.Join(parts, ".")
+		} else if i := strings.Index(strings.ToLower(table), " as "); i > -1 {
+			escaped_table = b.escape(table[:i], "") + " AS " + b.Quoter.ID(table[i+4:])
 		} else {
-			escaped_table = b.Quoter.ID(strings.ReplaceAll(table, ".", "_"))
+			parts := strings.Split(table, " ")
+			for i, part := range parts {
+				part = strings.TrimSpace(part)
+				parts[i] = b.Quoter.ID(part)
+			}
+			escaped_table = strings.Join(parts, " ")
 		}
 	}
 

builder/query_test.go

@@ -105,6 +105,22 @@ func TestQuery_Build(t *testing.T) {
 			result: "SELECT `users`.* FROM `users` FOR UPDATE;",
 			query:  rel.From("users").Lock("FOR UPDATE"),
 		},
+		{
+			result: "SELECT `c`.`id`,`c`.`name` FROM `contacts` `c`;",
+			query:  rel.Select("c.id", "c.name").From("contacts c"),
+		},
+		{
+			result: "SELECT `c`.`id`,`c`.`name` FROM `contacts` AS `c`;",
+			query:  rel.Select("c.id", "c.name").From("contacts as c"),
+		},
+		{
+			result: "SELECT `c`.`id`,`c`.`name` FROM `contacts` `c`;",
+			query:  rel.Select("c.id").Select("c.name").From("contacts c"),
+		},
+		{
+			result: "SELECT `c`.`id`,`c`.`name` FROM `contacts` AS `c`;",
+			query:  rel.Select("c.id").Select("c.name").From("contacts as c"),
+		},
 	}
 
 	for _, test := range tests {
@@ -185,6 +201,22 @@ func TestQuery_Build_ordinal(t *testing.T) {
 			result: "SELECT \"users\".* FROM \"users\" FOR UPDATE;",
 			query:  rel.From("users").Lock("FOR UPDATE"),
 		},
+		{
+			result: "SELECT \"c\".\"id\",\"c\".\"name\" FROM \"contacts\" \"c\";",
+			query:  rel.Select("c.id", "c.name").From("contacts c"),
+		},
+		{
+			result: "SELECT \"c\".\"id\",\"c\".\"name\" FROM \"contacts\" AS \"c\";",
+			query:  rel.Select("c.id", "c.name").From("contacts as c"),
+		},
+		{
+			result: "SELECT \"c\".\"id\",\"c\".\"name\" FROM \"contacts\" \"c\";",
+			query:  rel.Select("c.id").Select("c.name").From("contacts c"),
+		},
+		{
+			result: "SELECT \"c\".\"id\",\"c\".\"name\" FROM \"contacts\" AS \"c\";",
+			query:  rel.Select("c.id").Select("c.name").From("contacts as c"),
+		},
 	}
 
 	for _, test := range tests {