Fix of endtoend tests

Author: asmyasnikov

internal/cmd/generate.go

@@ -350,6 +350,7 @@ func codegen(ctx context.Context, combo config.CombinedSettings, sql OutputPair,
 		case plug.Process != nil:
 			handler = &process.Runner{
 				Cmd:    plug.Process.Cmd,
+				Dir:    combo.Dir,
 				Env:    plug.Env,
 				Format: plug.Process.Format,
 			}

internal/cmd/process.go

@@ -68,7 +68,7 @@ func processQuerySets(ctx context.Context, rp ResultProcessor, conf *config.Conf
 		errout := &stderrs[i]
 
 		grp.Go(func() error {
-			combo := config.Combine(*conf, sql.SQL)
+			combo := config.Combine(*conf, sql.SQL, dir)
 			if sql.Plugin != nil {
 				combo.Codegen = *sql.Plugin
 			}

internal/cmd/vet.go

@@ -464,7 +464,7 @@ func (c *checker) DSN(dsn string) (string, error) {
 
 func (c *checker) checkSQL(ctx context.Context, s config.SQL) error {
 	// TODO: Create a separate function for this logic so we can
-	combo := config.Combine(*c.Conf, s)
+	combo := config.Combine(*c.Conf, s, c.Dir)
 
 	// TODO: This feels like a hack that will bite us later
 	joined := make([]string, 0, len(s.Schema))

internal/compiler/engine.go

@@ -116,7 +116,7 @@ func NewCompiler(conf config.SQL, combo config.CombinedSettings, parserOpts opts
 	default:
 		// Check if this is a plugin engine
 		if enginePlugin, found := config.FindEnginePlugin(&combo.Global, string(conf.Engine)); found {
-			eng, err := createPluginEngine(enginePlugin)
+			eng, err := createPluginEngine(enginePlugin, combo.Dir)
 			if err != nil {
 				return nil, err
 			}
@@ -137,10 +137,10 @@ func NewCompiler(conf config.SQL, combo config.CombinedSettings, parserOpts opts
 }
 
 // createPluginEngine creates an engine from an engine plugin configuration.
-func createPluginEngine(ep *config.EnginePlugin) (engine.Engine, error) {
+func createPluginEngine(ep *config.EnginePlugin, dir string) (engine.Engine, error) {
 	switch {
 	case ep.Process != nil:
-		return plugin.NewPluginEngine(ep.Name, ep.Process.Cmd, ep.Env), nil
+		return plugin.NewPluginEngine(ep.Name, ep.Process.Cmd, dir, ep.Env), nil
 	case ep.WASM != nil:
 		return plugin.NewWASMPluginEngine(ep.Name, ep.WASM.URL, ep.WASM.SHA256, ep.Env), nil
 	default:

internal/config/config.go

@@ -326,12 +326,16 @@ type CombinedSettings struct {
 
 	// TODO: Combine these into a more usable type
 	Codegen Codegen
+
+	// Dir is the directory containing the config file (for resolving relative paths)
+	Dir string
 }
 
-func Combine(conf Config, pkg SQL) CombinedSettings {
+func Combine(conf Config, pkg SQL, dir string) CombinedSettings {
 	cs := CombinedSettings{
 		Global:  conf,
 		Package: pkg,
+		Dir:     dir,
 	}
 	if pkg.Gen.Go != nil {
 		cs.Go = *pkg.Gen.Go

internal/endtoend/endtoend_test.go

@@ -58,11 +58,11 @@ func TestExamples(t *testing.T) {
 			t.Parallel()
 			path := filepath.Join(examples, tc)
 			var stderr bytes.Buffer
-			opts := &cmd.Options{
-				Env:    cmd.Env{},
+			o := &cmd.Options{
+				Env:    cmd.Env{Debug: opts.DebugFromString("")},
 				Stderr: &stderr,
 			}
-			output, err := cmd.Generate(ctx, path, "", opts)
+			output, err := cmd.Generate(ctx, path, "", o)
 			if err != nil {
 				t.Fatalf("sqlc generate failed: %s", stderr.String())
 			}
@@ -311,7 +311,7 @@ func cmpDirectory(t *testing.T, dir string, actual map[string]string) {
 		if file.IsDir() {
 			return nil
 		}
-		if !strings.HasSuffix(path, ".go") && !strings.HasSuffix(path, ".kt") && !strings.HasSuffix(path, ".py") && !strings.HasSuffix(path, ".json") && !strings.HasSuffix(path, ".txt") {
+		if !strings.HasSuffix(path, ".go") && !strings.HasSuffix(path, ".kt") && !strings.HasSuffix(path, ".py") && !strings.HasSuffix(path, ".json") && !strings.HasSuffix(path, ".txt") && !strings.HasSuffix(path, ".rs") {
 			return nil
 		}
 		// TODO: Figure out a better way to ignore certain files
@@ -330,6 +330,10 @@ func cmpDirectory(t *testing.T, dir string, actual map[string]string) {
 		if strings.HasSuffix(path, "_test.go") || strings.Contains(path, "src/test/") {
 			return nil
 		}
+		// Skip plugin source files - they are not generated by sqlc
+		if strings.Contains(path, "/plugins/") {
+			return nil
+		}
 		if strings.Contains(path, "/python/.venv") || strings.Contains(path, "/python/src/tests/") ||
 			strings.HasSuffix(path, "__init__.py") || strings.Contains(path, "/python/src/dbtest/") ||
 			strings.Contains(path, "/python/.mypy_cache") {

internal/engine/plugin/process.go

@@ -24,6 +24,7 @@ import (
 // ProcessRunner runs an engine plugin as an external process.
 type ProcessRunner struct {
 	Cmd string
+	Dir string // Working directory for the plugin (config file directory)
 	Env []string
 
 	// Cached responses
@@ -32,9 +33,10 @@ type ProcessRunner struct {
 }
 
 // NewProcessRunner creates a new ProcessRunner.
-func NewProcessRunner(cmd string, env []string) *ProcessRunner {
+func NewProcessRunner(cmd, dir string, env []string) *ProcessRunner {
 	return &ProcessRunner{
 		Cmd: cmd,
+		Dir: dir,
 		Env: env,
 	}
 }
@@ -60,6 +62,10 @@ func (r *ProcessRunner) invoke(ctx context.Context, method string, req, resp pro
 	args := append(cmdParts[1:], method)
 	cmd := exec.CommandContext(ctx, path, args...)
 	cmd.Stdin = bytes.NewReader(stdin)
+	// Set working directory to config file directory for relative paths
+	if r.Dir != "" {
+		cmd.Dir = r.Dir
+	}
 	// Inherit the current environment and add SQLC_VERSION
 	cmd.Env = append(os.Environ(), fmt.Sprintf("SQLC_VERSION=%s", info.Version))
 
@@ -446,10 +452,10 @@ type PluginEngine struct {
 }
 
 // NewPluginEngine creates a new engine from a process plugin.
-func NewPluginEngine(name, cmd string, env []string) *PluginEngine {
+func NewPluginEngine(name, cmd, dir string, env []string) *PluginEngine {
 	return &PluginEngine{
 		name:   name,
-		runner: NewProcessRunner(cmd, env),
+		runner: NewProcessRunner(cmd, dir, env),
 	}
 }
 

internal/ext/process/gen.go

@@ -21,6 +21,7 @@ import (
 
 type Runner struct {
 	Cmd    string
+	Dir    string // Working directory for the plugin (config file directory)
 	Format string
 	Env    []string
 }
@@ -70,6 +71,10 @@ func (r *Runner) Invoke(ctx context.Context, method string, args any, reply any,
 	cmdArgs := append(cmdParts[1:], method)
 	cmd := exec.CommandContext(ctx, path, cmdArgs...)
 	cmd.Stdin = bytes.NewReader(stdin)
+	// Set working directory to config file directory for relative paths
+	if r.Dir != "" {
+		cmd.Dir = r.Dir
+	}
 	// Inherit the current environment (excluding SQLC_AUTH_TOKEN) and add SQLC_VERSION
 	for _, env := range os.Environ() {
 		if !strings.HasPrefix(env, "SQLC_AUTH_TOKEN=") {