Re-add format check to parser test for 00007_array (#52)

Author: kyleconroy

CLAUDE.md

@@ -2,14 +2,18 @@ package main
 
 import (
 	"encoding/json"
+	"flag"
 	"fmt"
 	"os"
 	"path/filepath"
 	"sort"
 )
 
+var formatFlag = flag.Bool("format", false, "Find tests with todo_format instead of todo")
+
 type testMetadata struct {
 	Todo       bool  `json:"todo,omitempty"`
+	TodoFormat bool  `json:"todo_format,omitempty"`
 	Explain    *bool `json:"explain,omitempty"`
 	Skip       bool  `json:"skip,omitempty"`
 	ParseError bool  `json:"parse_error,omitempty"`
@@ -21,6 +25,8 @@ type todoTest struct {
 }
 
 func main() {
+	flag.Parse()
+
 	testdataDir := "parser/testdata"
 	entries, err := os.ReadDir(testdataDir)
 	if err != nil {
@@ -49,9 +55,15 @@ func main() {
 			continue
 		}
 
-		// Only include tests marked as todo
-		if !metadata.Todo {
-			continue
+		// Check for todo or todo_format based on flag
+		if *formatFlag {
+			if !metadata.TodoFormat {
+				continue
+			}
+		} else {
+			if !metadata.Todo {
+				continue
+			}
 		}
 
 		// Skip tests with skip or explain=false or parse_error
@@ -72,8 +84,13 @@ func main() {
 		})
 	}
 
+	todoType := "todo"
+	if *formatFlag {
+		todoType = "todo_format"
+	}
+
 	if len(todoTests) == 0 {
-		fmt.Println("No todo tests found!")
+		fmt.Printf("No %s tests found!\n", todoType)
 		return
 	}
 
@@ -86,7 +103,7 @@ func main() {
 	next := todoTests[0]
 	testDir := filepath.Join(testdataDir, next.name)
 
-	fmt.Printf("Next test: %s\n\n", next.name)
+	fmt.Printf("Next %s test: %s\n\n", todoType, next.name)
 
 	// Print query.sql contents
 	queryPath := filepath.Join(testDir, "query.sql")
@@ -99,5 +116,5 @@ func main() {
 		fmt.Printf("\nExpected EXPLAIN output:\n%s\n", string(explainBytes))
 	}
 
-	fmt.Printf("\nRemaining todo tests: %d\n", len(todoTests))
+	fmt.Printf("\nRemaining %s tests: %d\n", todoType, len(todoTests))
 }

cmd/next-test/main.go

@@ -8,6 +8,9 @@ import (
 
 // formatSelectWithUnionQuery formats a SELECT with UNION query.
 func formatSelectWithUnionQuery(sb *strings.Builder, q *ast.SelectWithUnionQuery) {
+	if q == nil {
+		return
+	}
 	for i, sel := range q.Selects {
 		if i > 0 {
 			sb.WriteString(" UNION ")
@@ -23,6 +26,9 @@ func formatSelectWithUnionQuery(sb *strings.Builder, q *ast.SelectWithUnionQuery
 
 // formatSelectQuery formats a SELECT query.
 func formatSelectQuery(sb *strings.Builder, q *ast.SelectQuery) {
+	if q == nil {
+		return
+	}
 	sb.WriteString("SELECT ")
 
 	if q.Distinct {

internal/format/statements.go

@@ -17,9 +17,14 @@ import (
 // Use with: go test ./parser -check-skipped -v
 var checkSkipped = flag.Bool("check-skipped", false, "Run skipped todo tests to see which ones now pass")
 
+// checkFormat runs skipped todo_format tests to see which ones now pass.
+// Use with: go test ./parser -check-format -v
+var checkFormat = flag.Bool("check-format", false, "Run skipped todo_format tests to see which ones now pass")
+
 // testMetadata holds optional metadata for a test case
 type testMetadata struct {
 	Todo       bool   `json:"todo,omitempty"`
+	TodoFormat bool   `json:"todo_format,omitempty"` // true if format roundtrip test is pending
 	Source     string `json:"source,omitempty"`
 	Explain    *bool  `json:"explain,omitempty"`
 	Skip       bool   `json:"skip,omitempty"`
@@ -170,6 +175,33 @@ func TestParser(t *testing.T) {
 				}
 			}
 
+			// Check Format output (roundtrip test)
+			// Skip if todo_format is true, unless -check-format flag is set
+			if !metadata.TodoFormat || *checkFormat {
+				formatted := parser.Format(stmts)
+				expected := strings.TrimSpace(query)
+				if formatted != expected {
+					if metadata.TodoFormat {
+						if *checkFormat {
+							t.Logf("FORMAT STILL FAILING:\nExpected:\n%s\n\nGot:\n%s", expected, formatted)
+						}
+					} else {
+						t.Errorf("Format output mismatch\nExpected:\n%s\n\nGot:\n%s", expected, formatted)
+					}
+				} else if metadata.TodoFormat && *checkFormat {
+					// Automatically remove the todo_format flag from metadata.json
+					metadata.TodoFormat = false
+					updatedBytes, err := json.Marshal(metadata)
+					if err != nil {
+						t.Errorf("Failed to marshal updated metadata: %v", err)
+					} else if err := os.WriteFile(metadataPath, append(updatedBytes, '\n'), 0644); err != nil {
+						t.Errorf("Failed to write updated metadata.json: %v", err)
+					} else {
+						t.Logf("FORMAT ENABLED - removed todo_format flag from: %s", entry.Name())
+					}
+				}
+			}
+
 			// If we get here with a todo test and -check-skipped is set, the test passes!
 			// Automatically remove the todo flag from metadata.json
 			if metadata.Todo && *checkSkipped {

parser/parser_test.go

@@ -1 +1 @@
-{}
+{"todo_format":true}

parser/testdata/00001_count_hits/metadata.json

@@ -1 +1 @@
-{}
+{"todo_format":true}

parser/testdata/00001_select_1/metadata.json

@@ -1 +1 @@
-{}
+{"todo_format":true}

parser/testdata/00002_count_visits/metadata.json

@@ -1 +1 @@
-{}
+{"todo_format":true}

parser/testdata/00002_system_numbers/metadata.json

@@ -1 +1 @@
-{}
+{"todo_format":true}

parser/testdata/00003_reinterpret_as_string/metadata.json

@@ -1 +1 @@
-{}
+{"todo_format":true}