scripts/regenerate: print more details on failure

josharian · josharian · commit c147e96f0e79 · 2022-04-25T15:14:16.000-07:00
diff --git a/scripts/regenerate/main.go b/scripts/regenerate/main.go
@@ -21,9 +21,9 @@ func regenerate(dir string) error {
 			cwd := filepath.Dir(path)
 			cmd := exec.Command("sqlc-dev", "generate", "--experimental")
 			cmd.Dir = cwd
-			failed := cmd.Run()
+			out, failed := cmd.CombinedOutput()
 			if _, err := os.Stat(filepath.Join(cwd, "stderr.txt")); os.IsNotExist(err) && failed != nil {
-				return fmt.Errorf("%s: sqlc-dev generate failed", cwd)
+				return fmt.Errorf("%s: sqlc-dev generate failed: %v\n%s", cwd, failed, out)
 			}
 		}
 		return nil

Original file line number	Diff line number	Diff line change
`@@ -21,9 +21,9 @@ func regenerate(dir string) error {`
`21`	`21`	`cwd := filepath.Dir(path)`
`22`	`22`	`cmd := exec.Command("sqlc-dev", "generate", "--experimental")`
`23`	`23`	`cmd.Dir = cwd`
`24`		`- failed := cmd.Run()`
	`24`	`+ out, failed := cmd.CombinedOutput()`
`25`	`25`	`if _, err := os.Stat(filepath.Join(cwd, "stderr.txt")); os.IsNotExist(err) && failed != nil {`
`26`		`- return fmt.Errorf("%s: sqlc-dev generate failed", cwd)`
	`26`	`+ return fmt.Errorf("%s: sqlc-dev generate failed: %v\n%s", cwd, failed, out)`
`27`	`27`	`}`
`28`	`28`	`}`
`29`	`29`	`return nil`