Support a few more nodes

Author: kyleconroy

internal/engine/postgresql/print_test.go

@@ -7,6 +7,7 @@ import (
 
 	"github.com/google/go-cmp/cmp"
 
+	"github.com/sqlc-dev/sqlc/internal/debug"
 	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
 
@@ -18,8 +19,13 @@ func TestPrintAst(t *testing.T) {
 		`SELECT * FROM foo,bar;`,
 		`SELECT * FROM foo WHERE EXISTS (SELECT * FROM foo);`,
 		`WITH bar AS (SELECT * FROM foo), bat AS (SELECT 1) SELECT * FROM foo;`,
+		`SELECT t.* FROM foo t;`,
+		`SELECT *,*,foo.* FROM foo;`,
 	}
 
+	// Use astutils to look for select nodes
+	// Search for the deepest select nodes
+
 	for i, q := range queries {
 		q := q
 		t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
@@ -30,6 +36,7 @@ func TestPrintAst(t *testing.T) {
 			for _, stmt := range stmts {
 				out := ast.Format(stmt.Raw)
 				if diff := cmp.Diff(q, out); diff != "" {
+					debug.Dump(stmt)
 					t.Errorf("- %s", q)
 					t.Errorf("+ %s", out)
 				}

internal/sql/ast/alias.go

@@ -8,3 +8,12 @@ type Alias struct {
 func (n *Alias) Pos() int {
 	return 0
 }
+
+func (n *Alias) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	if n.Aliasname != nil {
+		buf.WriteString(*n.Aliasname)
+	}
+}

internal/sql/ast/column_ref.go

@@ -1,5 +1,7 @@
 package ast
 
+import "strings"
+
 type ColumnRef struct {
 	Name string
 
@@ -16,5 +18,17 @@ func (n *ColumnRef) Format(buf *TrackedBuffer) {
 	if n == nil {
 		return
 	}
-	buf.astFormat(n.Fields)
+
+	if n.Fields != nil {
+		var items []string
+		for _, item := range n.Fields.Items {
+			switch nn := item.(type) {
+			case *String:
+				items = append(items, nn.Str)
+			case *A_Star:
+				items = append(items, "*")
+			}
+		}
+		buf.WriteString(strings.Join(items, "."))
+	}
 }

internal/sql/ast/range_var.go

@@ -21,4 +21,8 @@ func (n *RangeVar) Format(buf *TrackedBuffer) {
 	if n.Relname != nil {
 		buf.WriteString(*n.Relname)
 	}
+	if n.Alias != nil {
+		buf.WriteString(" ")
+		buf.astFormat(n.Alias)
+	}
 }

internal/sql/ast/string.go

@@ -1,9 +1,18 @@
 package ast
 
+import "fmt"
+
 type String struct {
 	Str string
 }
 
 func (n *String) Pos() int {
 	return 0
 }
+
+func (n *String) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	fmt.Fprintf(buf, "%q", n.Str)
+}