Test all queries in endtoend

Author: kyleconroy

internal/endtoend/fmt_test.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"bytes"
+	"fmt"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+
+	pg_query "github.com/pganalyze/pg_query_go/v4"
+	"github.com/sqlc-dev/sqlc/internal/engine/postgresql"
+	"github.com/sqlc-dev/sqlc/internal/sql/ast"
+)
+
+func TestFormat(t *testing.T) {
+	t.Parallel()
+	var queries []string
+	err := filepath.Walk("testdata", func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if !strings.Contains(path, filepath.Join("pgx/v5")) {
+			return nil
+		}
+		if info.Name() == "query.sql" {
+			queries = append(queries, path)
+			return filepath.SkipDir
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	parse := postgresql.NewParser()
+	for _, q := range queries {
+		q := q
+		t.Run(filepath.Dir(q), func(t *testing.T) {
+			contents, err := os.ReadFile(q)
+			if err != nil {
+				t.Fatal(err)
+			}
+			for i, query := range bytes.Split(bytes.TrimSpace(contents), []byte(";")) {
+				if len(query) <= 1 {
+					continue
+				}
+				query := query
+				t.Run(fmt.Sprintf("%d", i), func(t *testing.T) {
+					expected, err := pg_query.Fingerprint(string(query))
+					if err != nil {
+						t.Fatal(err)
+					}
+					stmts, err := parse.Parse(bytes.NewReader(query))
+					if err != nil {
+						t.Fatal(err)
+					}
+					if len(stmts) != 1 {
+						t.Fatal("expected one statement")
+					}
+					out := ast.Format(stmts[0].Raw)
+					actual, err := pg_query.Fingerprint(out)
+					if err != nil {
+						t.Error(err)
+					}
+					if expected != actual {
+						t.Errorf("- %s", expected)
+						t.Errorf("- %s", string(query))
+						t.Errorf("+ %s", actual)
+						t.Errorf("+ %s", out)
+					}
+				})
+			}
+		})
+	}
+}

internal/engine/postgresql/print_test.go

@@ -10,3 +10,19 @@ type BoolExpr struct {
 func (n *BoolExpr) Pos() int {
 	return n.Location
 }
+
+func (n *BoolExpr) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	if items(n.Args) {
+		switch n.Boolop {
+		case BoolExprTypeAnd:
+			buf.join(n.Args, " AND ")
+		case BoolExprTypeOr:
+			buf.join(n.Args, " OR ")
+		case BoolExprTypeNot:
+			buf.join(n.Args, " NOT ")
+		}
+	}
+}

internal/sql/ast/bool_expr.go

@@ -12,3 +12,34 @@ type DeleteStmt struct {
 func (n *DeleteStmt) Pos() int {
 	return 0
 }
+
+func (n *DeleteStmt) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+
+	if n.WithClause != nil {
+		buf.astFormat(n.WithClause)
+		buf.WriteString(" ")
+	}
+
+	buf.WriteString("DELETE FROM ")
+	if items(n.Relations) {
+		buf.astFormat(n.Relations)
+	}
+
+	if set(n.WhereClause) {
+		buf.WriteString(" WHERE ")
+		buf.astFormat(n.WhereClause)
+	}
+
+	if set(n.LimitCount) {
+		buf.WriteString(" LIMIT ")
+		buf.astFormat(n.LimitCount)
+	}
+
+	if items(n.ReturningList) {
+		buf.WriteString(" RETURNING ")
+		buf.astFormat(n.ReturningList)
+	}
+}

internal/sql/ast/delete_stmt.go

@@ -17,3 +17,17 @@ type FuncCall struct {
 func (n *FuncCall) Pos() int {
 	return n.Location
 }
+
+func (n *FuncCall) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.astFormat(n.Func)
+	buf.WriteString("(")
+	if n.AggStar {
+		buf.WriteString("*")
+	} else {
+		buf.astFormat(n.Args)
+	}
+	buf.WriteString(")")
+}

internal/sql/ast/func_call.go

@@ -9,3 +9,16 @@ type FuncName struct {
 func (n *FuncName) Pos() int {
 	return 0
 }
+
+func (n *FuncName) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	if n.Schema != "" {
+		buf.WriteString(n.Schema)
+		buf.WriteString(".")
+	}
+	if n.Name != "" {
+		buf.WriteString(n.Name)
+	}
+}

internal/sql/ast/func_name.go

@@ -1,7 +1,5 @@
 package ast
 
-import "github.com/sqlc-dev/sqlc/internal/debug"
-
 type InsertStmt struct {
 	Relation         *RangeVar
 	Cols             *List
@@ -28,7 +26,6 @@ func (n *InsertStmt) Format(buf *TrackedBuffer) {
 
 	buf.WriteString("INSERT INTO ")
 	if n.Relation != nil {
-		debug.Dump(n.Relation)
 		buf.astFormat(n.Relation)
 	}
 	if items(n.Cols) {

internal/sql/ast/insert_stmt.go

@@ -14,3 +14,14 @@ type JoinExpr struct {
 func (n *JoinExpr) Pos() int {
 	return 0
 }
+
+func (n *JoinExpr) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.astFormat(n.Larg)
+	buf.WriteString(" JOIN ")
+	buf.astFormat(n.Rarg)
+	buf.WriteString(" ON ")
+	buf.astFormat(n.Quals)
+}

internal/sql/ast/join_expr.go

@@ -12,10 +12,5 @@ func (n *List) Format(buf *TrackedBuffer) {
 	if n == nil {
 		return
 	}
-	for i, item := range n.Items {
-		if i > 0 {
-			buf.WriteRune(',')
-		}
-		buf.astFormat(item)
-	}
+	buf.join(n, ",")
 }

internal/sql/ast/list.go

@@ -9,3 +9,10 @@ type MultiAssignRef struct {
 func (n *MultiAssignRef) Pos() int {
 	return 0
 }
+
+func (n *MultiAssignRef) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.astFormat(n.Source)
+}