Apply suggestions from code review

Author: asmyasnikov

internal/cmd/vet.go

@@ -465,9 +465,6 @@ 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)
-	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/compiler/engine.go

@@ -112,8 +112,7 @@ func NewCompiler(conf config.SQL, combo config.CombinedSettings, parserOpts opts
 			}
 		}
 	default:
-		return nil, fmt.Errorf("unknown engine: %s\n\nTo use a custom database engine, add it to the 'engines' section of sqlc.yaml:\n\n  engines:\n    - name: %s\n      process:\n        cmd: sqlc-engine-%s\n\nThen install the plugin: go install github.com/example/sqlc-engine-%s@latest",
-			conf.Engine, conf.Engine, conf.Engine, conf.Engine)
+		return nil, fmt.Errorf("unknown engine: %s", conf.Engine)
 	}
 	return c, nil
 }

internal/compiler/parse.go

@@ -27,6 +27,8 @@ func (c *Compiler) parseQuery(stmt ast.Node, src string, o opts.Parser) (*Query,
 		return nil, err
 	}
 
+	// rewrite queries to remove sqlc.* functions
+
 	raw, ok := stmt.(*ast.RawStmt)
 	if !ok {
 		return nil, errors.New("node is not a statement")