fix(db): handle indented \ir and multi-directory test files

7ttp · 7ttp · commit d71d0dcbeb57 · 2026-02-14T20:41:23.000+05:30
diff --git a/internal/db/test/test.go b/internal/db/test/test.go
@@ -27,7 +27,7 @@ const (
 	DISABLE_PGTAP = "drop extension if exists pgtap"
 )
 
-var irPattern = regexp.MustCompile(`(?im)^\\ir\s+['"]?([^'"\s]+)['"]?`)
+var irPattern = regexp.MustCompile(`(?im)^\s*\\ir\s+['"]?([^'"\s]+)['"]?`)
 
 func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {
 	// Build test command
@@ -58,7 +58,7 @@ func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afe
 		}
 		if _, isTestFile := testFileSet[allFiles[i]]; isTestFile {
 			relPath := dockerPath
-			if path.Ext(dockerPath) != "" {
+			if path.Ext(dockerPath) != "" && path.Dir(dockerPath) == workingDir {
 				relPath = path.Base(dockerPath)
 			}
 			cmd = append(cmd, relPath)

Original file line number	Diff line number	Diff line change
`@@ -27,7 +27,7 @@ const (`
`27`	`27`	`DISABLE_PGTAP = "drop extension if exists pgtap"`
`28`	`28`	`)`
`29`	`29`
`30`		-var irPattern = regexp.MustCompile(`(?im)^\\ir\s+['"]?([^'"\s]+)['"]?`)
	`30`	+var irPattern = regexp.MustCompile(`(?im)^\s*\\ir\s+['"]?([^'"\s]+)['"]?`)
`31`	`31`
`32`	`32`	`func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afero.Fs, options ...func(*pgx.ConnConfig)) error {`
`33`	`33`	`// Build test command`
`@@ -58,7 +58,7 @@ func Run(ctx context.Context, testFiles []string, config pgconn.Config, fsys afe`
`58`	`58`	`}`
`59`	`59`	`if _, isTestFile := testFileSet[allFiles[i]]; isTestFile {`
`60`	`60`	`relPath := dockerPath`
`61`		`- if path.Ext(dockerPath) != "" {`
	`61`	`+ if path.Ext(dockerPath) != "" && path.Dir(dockerPath) == workingDir {`
`62`	`62`	`relPath = path.Base(dockerPath)`
`63`	`63`	`}`
`64`	`64`	`cmd = append(cmd, relPath)`