internal/parser: Support joins with aliases (#326)

Author: kyleconroy

internal/dinosql/parser.go

@@ -576,19 +576,31 @@ func expandStmt(qc *QueryCatalog, raw nodes.RawStmt, node nodes.Node) ([]edit, e
 				return nil, fmt.Errorf("unknown field in ColumnRef: %T", f)
 			}
 		}
+		scope := join(ref.Fields, ".")
+		counts := map[string]int{}
+		if scope == "" {
+			for _, t := range tables {
+				for _, c := range t.Columns {
+					counts[c.Name] += 1
+				}
+			}
+		}
 		for _, t := range tables {
-			scope := join(ref.Fields, ".")
 			if scope != "" && scope != t.Name {
 				continue
 			}
 			for _, c := range t.Columns {
+				fmt.Println(c.Name)
 				cname := c.Name
 				if res.Name != nil {
 					cname = *res.Name
 				}
 				if scope != "" {
 					cname = scope + "." + cname
 				}
+				if counts[cname] > 1 {
+					cname = t.Name + "." + cname
+				}
 				if postgres.IsReservedKeyword(cname) {
 					cname = "\"" + cname + "\""
 				}
@@ -726,6 +738,9 @@ func sourceTables(qc *QueryCatalog, node nodes.Node) ([]core.Table, error) {
 				cerr.Location = n.Location
 				return nil, *cerr
 			}
+			if n.Alias != nil {
+				table.Name = *n.Alias.Aliasname
+			}
 			tables = append(tables, table)
 		default:
 			return nil, fmt.Errorf("sourceTable: unsupported list item type: %T", n)

internal/endtoend/testdata/join_alias/go/db.go

@@ -0,0 +1,14 @@
+CREATE TABLE foo (id serial not null);
+CREATE TABLE bar (id serial not null references foo(id), title text);
+
+-- name: AliasJoin :many
+SELECT f.id, b.title
+FROM foo f
+JOIN bar b ON b.id = f.id
+WHERE f.id = $1;
+
+-- name: AliasExpand :many
+SELECT *
+FROM foo f
+JOIN bar b ON b.id = f.id
+WHERE f.id = $1;

internal/endtoend/testdata/join_alias/go/models.go

@@ -0,0 +1,9 @@
+{
+  "version": "1",
+  "packages": [{
+    "path": "go",
+	"name": "querytest",
+	"schema": "query.sql",
+	"queries": "query.sql"
+  }]
+}