More Format

Author: kyleconroy

internal/endtoend/fmt_test.go

@@ -9,6 +9,7 @@ import (
 	"testing"
 
 	pg_query "github.com/pganalyze/pg_query_go/v4"
+	"github.com/sqlc-dev/sqlc/internal/debug"
 	"github.com/sqlc-dev/sqlc/internal/engine/postgresql"
 	"github.com/sqlc-dev/sqlc/internal/sql/ast"
 )
@@ -63,6 +64,7 @@ func TestFormat(t *testing.T) {
 						t.Error(err)
 					}
 					if expected != actual {
+						debug.Dump(stmts[0].Raw)
 						t.Errorf("- %s", expected)
 						t.Errorf("- %s", string(query))
 						t.Errorf("+ %s", actual)

internal/sql/ast/case_expr.go

@@ -13,3 +13,14 @@ type CaseExpr struct {
 func (n *CaseExpr) Pos() int {
 	return n.Location
 }
+
+func (n *CaseExpr) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("CASE ")
+	buf.astFormat(n.Args)
+	buf.WriteString(" ELSE ")
+	buf.astFormat(n.Defresult)
+	buf.WriteString(" END ")
+}

internal/sql/ast/case_when.go

@@ -10,3 +10,13 @@ type CaseWhen struct {
 func (n *CaseWhen) Pos() int {
 	return n.Location
 }
+
+func (n *CaseWhen) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("WHEN ")
+	buf.astFormat(n.Expr)
+	buf.WriteString(" THEN ")
+	buf.astFormat(n.Result)
+}

internal/sql/ast/listen_stmt.go

@@ -7,3 +7,13 @@ type ListenStmt struct {
 func (n *ListenStmt) Pos() int {
 	return 0
 }
+
+func (n *ListenStmt) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("LISTEN ")
+	if n.Conditionname != nil {
+		buf.WriteString(*n.Conditionname)
+	}
+}

internal/sql/ast/notify_stmt.go

@@ -8,3 +8,18 @@ type NotifyStmt struct {
 func (n *NotifyStmt) Pos() int {
 	return 0
 }
+
+func (n *NotifyStmt) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("NOTIFY ")
+	if n.Conditionname != nil {
+		buf.WriteString(*n.Conditionname)
+	}
+	if n.Payload != nil {
+		buf.WriteString(", '")
+		buf.WriteString(*n.Payload)
+		buf.WriteString("'")
+	}
+}

internal/sql/ast/null.go

@@ -6,3 +6,6 @@ type Null struct {
 func (n *Null) Pos() int {
 	return 0
 }
+func (n *Null) Format(buf *TrackedBuffer) {
+	buf.WriteString("NULL")
+}

internal/sql/ast/res_target.go

@@ -15,8 +15,9 @@ func (n *ResTarget) Format(buf *TrackedBuffer) {
 	if n == nil {
 		return
 	}
+	buf.astFormat(n.Val)
 	if n.Name != nil {
+		buf.WriteString(" AS ")
 		buf.WriteString(*n.Name)
 	}
-	buf.astFormat(n.Val)
 }

internal/sql/ast/type_name.go

@@ -24,5 +24,5 @@ func (n *TypeName) Format(buf *TrackedBuffer) {
 	if n == nil {
 		return
 	}
-	buf.astFormat(n.Names)
+	buf.join(n.Names, ".")
 }