revert Combine

Author: asmyasnikov

internal/cmd/process.go

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

internal/cmd/vet.go

@@ -464,7 +464,10 @@ 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, c.Dir)
+	combo := config.Combine(*c.Conf, s)
+	if c.Dir != "" {
+		combo.Dir = c.Dir
+	}
 
 	// TODO: This feels like a hack that will bite us later
 	joined := make([]string, 0, len(s.Schema))

internal/config/config.go

@@ -331,11 +331,10 @@ type CombinedSettings struct {
 	Dir string
 }
 
-func Combine(conf Config, pkg SQL, dir string) CombinedSettings {
+func Combine(conf Config, pkg SQL) CombinedSettings {
 	cs := CombinedSettings{
 		Global:  conf,
 		Package: pkg,
-		Dir:     dir,
 	}
 	if pkg.Gen.Go != nil {
 		cs.Go = *pkg.Gen.Go