Close to all tests passing

Author: kyleconroy

internal/endtoend/endtoend.go

@@ -0,0 +1,81 @@
+package main
+
+import (
+	"encoding/json"
+	"os"
+	"path/filepath"
+	"strings"
+	"testing"
+)
+
+type Testcase struct {
+	Name       string
+	Path       string
+	ConfigName string
+	Stderr     []byte
+	Exec       *Exec
+}
+
+type Exec struct {
+	Command string            `json:"command"`
+	Process string            `json:"process"`
+	Env     map[string]string `json:"env"`
+}
+
+func parseStderr(t *testing.T, dir string) []byte {
+	t.Helper()
+	path := filepath.Join(dir, "stderr.txt")
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return nil
+	}
+	blob, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	return blob
+}
+
+func parseExec(t *testing.T, dir string) *Exec {
+	t.Helper()
+	path := filepath.Join(dir, "exec.json")
+	if _, err := os.Stat(path); os.IsNotExist(err) {
+		return nil
+	}
+	var e Exec
+	blob, err := os.ReadFile(path)
+	if err != nil {
+		t.Fatal(err)
+	}
+	if err := json.Unmarshal(blob, &e); err != nil {
+		t.Fatal(err)
+	}
+	if e.Command == "" {
+		e.Command = "generate"
+	}
+	return &e
+}
+
+func FindTests(t *testing.T, root string) []*Testcase {
+	var tcs []*Testcase
+	err := filepath.Walk(root, func(path string, info os.FileInfo, err error) error {
+		if err != nil {
+			return err
+		}
+		if info.Name() == "sqlc.json" || info.Name() == "sqlc.yaml" {
+			dir := filepath.Dir(path)
+			tcs = append(tcs, &Testcase{
+				Path:       dir,
+				Name:       strings.TrimPrefix(dir, root+string(filepath.Separator)),
+				ConfigName: info.Name(),
+				Stderr:     parseStderr(t, dir),
+				Exec:       parseExec(t, dir),
+			})
+			return filepath.SkipDir
+		}
+		return nil
+	})
+	if err != nil {
+		t.Fatal(err)
+	}
+	return tcs
+}

internal/endtoend/endtoend_test.go

@@ -3,7 +3,6 @@ package main
 import (
 	"bytes"
 	"context"
-	"encoding/json"
 	"os"
 	osexec "os/exec"
 	"path/filepath"
@@ -81,32 +80,21 @@ func TestReplay(t *testing.T) {
 
 	t.Parallel()
 	ctx := context.Background()
-	var dirs []string
-	err := filepath.Walk("testdata", func(path string, info os.FileInfo, err error) error {
-		if err != nil {
-			return err
-		}
-		if info.Name() == "sqlc.json" || info.Name() == "sqlc.yaml" || info.Name() == "sqlc.yml" {
-			dirs = append(dirs, filepath.Dir(path))
-			return filepath.SkipDir
-		}
-		return nil
-	})
-	if err != nil {
-		t.Fatal(err)
-	}
-	for _, replay := range dirs {
+	for _, replay := range FindTests(t, "testdata") {
 		tc := replay
-		t.Run(tc, func(t *testing.T) {
+		t.Run(tc.Name, func(t *testing.T) {
 			t.Parallel()
 
 			var stderr bytes.Buffer
 			var output map[string]string
 			var err error
 
-			path, _ := filepath.Abs(tc)
-			args := parseExec(t, path)
-			expected := expectedStderr(t, path)
+			path, _ := filepath.Abs(tc.Path)
+			args := tc.Exec
+			if args == nil {
+				args = &Exec{Command: "generate"}
+			}
+			expected := string(tc.Stderr)
 
 			if args.Process != "" {
 				_, err := osexec.LookPath(args.Process)
@@ -206,44 +194,6 @@ func cmpDirectory(t *testing.T, dir string, actual map[string]string) {
 	}
 }
 
-func expectedStderr(t *testing.T, dir string) string {
-	t.Helper()
-	path := filepath.Join(dir, "stderr.txt")
-	if _, err := os.Stat(path); !os.IsNotExist(err) {
-		blob, err := os.ReadFile(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-		return string(blob)
-	}
-	return ""
-}
-
-type exec struct {
-	Command string            `json:"command"`
-	Process string            `json:"process"`
-	Env     map[string]string `json:"env"`
-}
-
-func parseExec(t *testing.T, dir string) exec {
-	t.Helper()
-	var e exec
-	path := filepath.Join(dir, "exec.json")
-	if _, err := os.Stat(path); !os.IsNotExist(err) {
-		blob, err := os.ReadFile(path)
-		if err != nil {
-			t.Fatal(err)
-		}
-		if err := json.Unmarshal(blob, &e); err != nil {
-			t.Fatal(err)
-		}
-	}
-	if e.Command == "" {
-		e.Command = "generate"
-	}
-	return e
-}
-
 func BenchmarkReplay(b *testing.B) {
 	ctx := context.Background()
 	var dirs []string

internal/endtoend/fmt_test.go

@@ -16,27 +16,20 @@ import (
 
 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
+	parse := postgresql.NewParser()
+	for _, tc := range FindTests(t, "testdata") {
+		tc := tc
+
+		if !strings.Contains(tc.Path, filepath.Join("pgx/v5")) {
+			continue
 		}
-		if info.Name() == "query.sql" {
-			queries = append(queries, path)
-			return filepath.SkipDir
+
+		q := filepath.Join(tc.Path, "query.sql")
+		if _, err := os.Stat(q); os.IsNotExist(err) {
+			continue
 		}
-		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) {
+
+		t.Run(tc.Name, func(t *testing.T) {
 			contents, err := os.ReadFile(q)
 			if err != nil {
 				t.Fatal(err)
@@ -58,6 +51,11 @@ func TestFormat(t *testing.T) {
 					if len(stmts) != 1 {
 						t.Fatal("expected one statement")
 					}
+					if false {
+						r, err := pg_query.Parse(string(query))
+						debug.Dump(r, err)
+					}
+
 					out := ast.Format(stmts[0].Raw)
 					actual, err := pg_query.Fingerprint(out)
 					if err != nil {

internal/sql/ast/a_expr.go

@@ -18,7 +18,13 @@ func (n *A_Expr) Format(buf *TrackedBuffer) {
 	}
 	buf.astFormat(n.Lexpr)
 	buf.WriteString(" ")
-	buf.astFormat(n.Name)
-	buf.WriteString(" ")
-	buf.astFormat(n.Rexpr)
+	if n.Kind == A_Expr_Kind_IN {
+		buf.WriteString(" IN (")
+		buf.astFormat(n.Rexpr)
+		buf.WriteString(")")
+	} else {
+		buf.astFormat(n.Name)
+		buf.WriteString(" ")
+		buf.astFormat(n.Rexpr)
+	}
 }

internal/sql/ast/a_expr_kind.go

@@ -2,6 +2,10 @@ package ast
 
 type A_Expr_Kind uint
 
+const (
+	A_Expr_Kind_IN A_Expr_Kind = 7
+)
+
 func (n *A_Expr_Kind) Pos() int {
 	return 0
 }

internal/sql/ast/alias.go

@@ -16,4 +16,9 @@ func (n *Alias) Format(buf *TrackedBuffer) {
 	if n.Aliasname != nil {
 		buf.WriteString(*n.Aliasname)
 	}
+	if items(n.Colnames) {
+		buf.WriteString("(")
+		buf.astFormat((n.Colnames))
+		buf.WriteString(")")
+	}
 }

internal/sql/ast/bool_expr.go

@@ -15,14 +15,17 @@ func (n *BoolExpr) Format(buf *TrackedBuffer) {
 	if n == nil {
 		return
 	}
+	buf.WriteString("(")
 	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 ")
+			buf.WriteString(" NOT ")
+			buf.astFormat(n.Args)
 		}
 	}
+	buf.WriteString(")")
 }

internal/sql/ast/call_stmt.go

@@ -10,3 +10,8 @@ func (n *CallStmt) Pos() int {
 	}
 	return n.FuncCall.Pos()
 }
+
+func (n *CallStmt) Format(buf *TrackedBuffer) {
+	buf.WriteString("CALL ")
+	buf.astFormat(n.FuncCall)
+}

internal/sql/ast/coalesce_expr.go

@@ -11,3 +11,12 @@ type CoalesceExpr struct {
 func (n *CoalesceExpr) Pos() int {
 	return n.Location
 }
+
+func (n *CoalesceExpr) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString("COALESCE(")
+	buf.astFormat(n.Args)
+	buf.WriteString(")")
+}

internal/sql/ast/column_def.go

@@ -30,3 +30,15 @@ type ColumnDef struct {
 func (n *ColumnDef) Pos() int {
 	return n.Location
 }
+
+func (n *ColumnDef) Format(buf *TrackedBuffer) {
+	if n == nil {
+		return
+	}
+	buf.WriteString(n.Colname)
+	buf.WriteString(" ")
+	buf.astFormat(n.TypeName)
+	if n.IsNotNull {
+		buf.WriteString(" NOT NULL")
+	}
+}