Remove todo metadata key and related code

- Remove Todo field from testMetadata struct in parser_test.go
- Remove -check-skipped flag and related logic
- Remove todo key from 146 metadata.json files
- Update cmd/next-test to only support -format flag
- Update CLAUDE.md documentation

The explain_todo key now provides more granular control for
skipping specific statement tests within a test case.

Author: claude

CLAUDE.md

@@ -2,14 +2,6 @@
 
 ## Next Steps
 
-To find the next test to work on, run:
-
-```bash
-go run ./cmd/next-test
-```
-
-This tool finds all tests with `todo: true` in their metadata and returns the one with the shortest `query.sql` file.
-
 To find the next format roundtrip test to work on, run:
 
 ```bash
@@ -18,18 +10,6 @@ go run ./cmd/next-test -format
 
 This finds tests with `todo_format: true` in their metadata.
 
-## Workflow
-
-1. Run `go run ./cmd/next-test` to find the next test to implement
-2. Check the test's `query.sql` to understand what ClickHouse SQL needs parsing
-3. Check the test's `explain.txt` to understand the expected EXPLAIN output
-4. Implement the necessary AST types in `ast/`
-5. Add parser logic in `parser/parser.go`
-6. Update the `Explain()` function if needed to match ClickHouse's output format
-7. Enable the test by removing `todo: true` from its `metadata.json` (set it to `{}`)
-8. Run `go test ./parser/... -timeout 5s` to verify
-9. Check if other todo tests now pass (see below)
-
 ## Running Tests
 
 Always run parser tests with a 5 second timeout:
@@ -40,16 +20,6 @@ go test ./parser/... -timeout 5s
 
 The tests are very fast. If a test is timing out, it indicates a bug (likely an infinite loop in the parser).
 
-## Checking for Newly Passing Todo Tests
-
-After implementing parser changes, run:
-
-```bash
-go test ./parser/... -check-skipped -v 2>&1 | grep "PASSES NOW"
-```
-
-Tests that output `PASSES NOW` can have their `todo` flag removed from `metadata.json`. This helps identify when parser improvements fix multiple tests at once.
-
 ## Checking for Newly Passing Format Tests
 
 After implementing format changes, run:
@@ -64,14 +34,15 @@ Tests that output `FORMAT PASSES NOW` can have their `todo_format` flag removed
 
 Each test in `parser/testdata/` contains:
 
-- `metadata.json` - `{}` for enabled tests, `{"todo": true}` for pending tests
+- `metadata.json` - `{}` for enabled tests
 - `query.sql` - ClickHouse SQL to parse
 - `explain.txt` - Expected EXPLAIN AST output (matches ClickHouse's format)
+- `explain_N.txt` - Expected EXPLAIN AST output for Nth statement (N >= 2)
 
 ### Metadata Options
 
-- `todo: true` - Test is pending parser/explain implementation
 - `todo_format: true` - Format roundtrip test is pending implementation
+- `explain_todo: {"stmt2": true}` - Skip specific statement subtests
 - `skip: true` - Skip test entirely (e.g., causes infinite loop)
 - `explain: false` - Skip test (e.g., ClickHouse couldn't parse it)
 - `parse_error: true` - Query is intentionally invalid SQL

cmd/next-test/main.go

@@ -9,10 +9,9 @@ import (
 	"sort"
 )
 
-var formatFlag = flag.Bool("format", false, "Find tests with todo_format instead of todo")
+var formatFlag = flag.Bool("format", false, "Find tests with todo_format (required)")
 
 type testMetadata struct {
-	Todo       bool  `json:"todo,omitempty"`
 	TodoFormat bool  `json:"todo_format,omitempty"`
 	Explain    *bool `json:"explain,omitempty"`
 	Skip       bool  `json:"skip,omitempty"`
@@ -27,6 +26,12 @@ type todoTest struct {
 func main() {
 	flag.Parse()
 
+	if !*formatFlag {
+		fmt.Fprintf(os.Stderr, "Usage: go run ./cmd/next-test -format\n")
+		fmt.Fprintf(os.Stderr, "Finds tests with todo_format: true in metadata.\n")
+		os.Exit(1)
+	}
+
 	testdataDir := "parser/testdata"
 	entries, err := os.ReadDir(testdataDir)
 	if err != nil {
@@ -55,15 +60,9 @@ func main() {
 			continue
 		}
 
-		// Check for todo or todo_format based on flag
-		if *formatFlag {
-			if !metadata.TodoFormat {
-				continue
-			}
-		} else {
-			if !metadata.Todo {
-				continue
-			}
+		// Check for todo_format
+		if !metadata.TodoFormat {
+			continue
 		}
 
 		// Skip tests with skip or explain=false or parse_error
@@ -84,13 +83,8 @@ func main() {
 		})
 	}
 
-	todoType := "todo"
-	if *formatFlag {
-		todoType = "todo_format"
-	}
-
 	if len(todoTests) == 0 {
-		fmt.Printf("No %s tests found!\n", todoType)
+		fmt.Printf("No todo_format tests found!\n")
 		return
 	}
 
@@ -103,7 +97,7 @@ func main() {
 	next := todoTests[0]
 	testDir := filepath.Join(testdataDir, next.name)
 
-	fmt.Printf("Next %s test: %s\n\n", todoType, next.name)
+	fmt.Printf("Next todo_format test: %s\n\n", next.name)
 
 	// Print query.sql contents
 	queryPath := filepath.Join(testDir, "query.sql")
@@ -116,5 +110,5 @@ func main() {
 		fmt.Printf("\nExpected EXPLAIN output:\n%s\n", string(explainBytes))
 	}
 
-	fmt.Printf("\nRemaining %s tests: %d\n", todoType, len(todoTests))
+	fmt.Printf("\nRemaining todo_format tests: %d\n", len(todoTests))
 }

parser/parser_test.go

@@ -15,17 +15,12 @@ import (
 	"github.com/sqlc-dev/doubleclick/parser"
 )
 
-// checkSkipped runs skipped todo tests to see which ones now pass.
-// 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
 	ExplainTodo map[string]bool `json:"explain_todo,omitempty"` // map of stmtN -> true to skip specific statements
 	Source      string          `json:"source,omitempty"`
@@ -116,7 +111,6 @@ func findCommentStart(line string) int {
 // Each subdirectory in testdata represents a test case with:
 // - query.sql: The SQL query to parse (may contain multiple statements)
 // - metadata.json (optional): Metadata including:
-//   - todo: true if the test is not yet expected to pass
 //   - explain: false to skip the test (e.g., when ClickHouse couldn't parse it)
 //   - skip: true to skip the test entirely (e.g., causes infinite loop)
 //   - parse_error: true if the query is intentionally invalid SQL (expected to fail parsing)
@@ -164,12 +158,9 @@ func TestParser(t *testing.T) {
 			}
 
 			// Skip tests where explain is explicitly false (e.g., ClickHouse couldn't parse it)
-			// Unless -check-skipped is set and the test is a todo test
 			if metadata.Explain != nil && !*metadata.Explain {
-				if !(*checkSkipped && metadata.Todo) {
-					t.Skipf("Skipping: explain is false in metadata")
-					return
-				}
+				t.Skipf("Skipping: explain is false in metadata")
+				return
 			}
 
 			// Split into individual statements
@@ -219,14 +210,6 @@ func TestParser(t *testing.T) {
 							t.Skipf("Expected parse error (intentionally invalid SQL)")
 							return
 						}
-						if metadata.Todo {
-							if *checkSkipped {
-								t.Skipf("STILL FAILING (parse error): %v", parseErr)
-							} else {
-								t.Skipf("TODO: Parser does not yet support (error: %v)", parseErr)
-							}
-							return
-						}
 						t.Fatalf("Parse error: %v", parseErr)
 					}
 
@@ -239,14 +222,6 @@ func TestParser(t *testing.T) {
 					// Verify we can serialize to JSON
 					_, jsonErr := json.Marshal(stmts[0])
 					if jsonErr != nil {
-						if metadata.Todo {
-							if *checkSkipped {
-								t.Skipf("STILL FAILING (JSON serialization): %v", jsonErr)
-							} else {
-								t.Skipf("TODO: JSON serialization failed: %v", jsonErr)
-							}
-							return
-						}
 						t.Fatalf("JSON marshal error: %v\nQuery: %s", jsonErr, stmt)
 					}
 
@@ -260,14 +235,6 @@ func TestParser(t *testing.T) {
 						actual := strings.TrimSpace(parser.Explain(stmts[0]))
 						// Use case-insensitive comparison since ClickHouse EXPLAIN AST has inconsistent casing
 						if !strings.EqualFold(actual, expected) {
-							if metadata.Todo {
-								if *checkSkipped {
-									t.Skipf("STILL FAILING (explain mismatch):\nExpected:\n%s\n\nGot:\n%s", expected, actual)
-								} else {
-									t.Skipf("TODO: Explain output mismatch\nQuery: %s\nExpected:\n%s\n\nGot:\n%s", stmt, expected, actual)
-								}
-								return
-							}
 							t.Errorf("Explain output mismatch\nQuery: %s\nExpected:\n%s\n\nGot:\n%s", stmt, expected, actual)
 						}
 					}
@@ -302,18 +269,6 @@ func TestParser(t *testing.T) {
 						}
 					}
 
-					// If we get here with a todo test and -check-skipped is set on first statement, the test passes!
-					if stmtIndex == 1 && metadata.Todo && *checkSkipped {
-						metadata.Todo = 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("ENABLED - removed todo flag from: %s", entry.Name())
-						}
-					}
 				})
 			}
 		})

parser/testdata/00031_parser_number/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00052_group_by_in/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00162_shard_global_join/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00239_type_conversion_in_in/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00300_csv/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00441_nulls_in/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}

parser/testdata/00461_default_value_of_argument_type/metadata.json

@@ -1 +1,3 @@
-{"todo":true,"todo_format":true}
+{
+  "todo_format": true
+}