@pgsql/transform 18.11.1 → 18.13.0

package/README.md

@@ -58,6 +58,29 @@ Qualify unqualified object references against an inventory of known objects, wit
 
 `normalizeTree` / `cleanTree` / `validateRoundTrip` — dependency-free AST normalization and mutation-aware parse→deparse→re-parse validation.
 
+## Relationship to `@pgsql/traverse`
+
+This package owns **policy**, not traversal. Every entry point above parses once,
+then drives `walk` from `@pgsql/traverse` over the parsed script — statements and
+hydrated PL/pgSQL bodies alike — with a visitor built here:
+
+| Concern | Lives here |
+|---|---|
+| Which schema/role/extension a name maps to | `SchemaRouter`, `RoleRouter`, extension routes |
+| What counts as a reference, a creation, a security-relevant statement | `classifyStatements` |
+| When an unqualified name should be qualified | `qualifyUnqualified` |
+| Whether the rewritten SQL still parses to the same tree | `validateRoundTrip` |
+| How to reach every node of a SQL or PL/pgSQL AST | **`@pgsql/traverse`** |
+
+So mapping logic never moves into the walker, and traversal logic never moves in
+here. Some passes keep per-statement state (CTE names in `qualifyUnqualified`,
+per-statement facts in `classifyStatements`) and drive the `walkSqlAst` /
+`walkPlpgsqlAst` primitives directly with a visitor per statement.
+
+Consequence for contributors: `__fixtures__/output/` is the regression gate for
+traversal changes made *anywhere* in the ecosystem. A walker change that alters
+these golden files is a behavior change, not a refactor.
+
 ## Scripts
 
 - `npm run fixtures` — regenerate `__fixtures__/output/` golden files from `__fixtures__/input/`

package/esm/extension-transform.js

@@ -14,8 +14,8 @@
  * inventory, so built-ins that merely share a name with an extension symbol
  * (and symbols that have graduated into core) are left untouched.
  */
-import { walk as walkSql } from '@pgsql/traverse';
-import { Deparser, parseSql, transformSync, walk as walkPlpgsql } from 'plpgsql-parser';
+import { walk, walkSqlAst } from '@pgsql/traverse';
+import { Deparser, parseSql, transformSync } from 'plpgsql-parser';
 import { ExtensionRouter } from './extension-router';
 /** Create a fresh result tracker. */
 export function createExtensionResult() {
@@ -167,7 +167,7 @@ function rewriteSqlBodyString(body, router, result) {
     for (const stmt of stmts) {
         if (!stmt?.stmt)
             continue;
-        walkSql(stmt.stmt, visitor);
+        walkSqlAst(stmt.stmt, visitor);
         pieces.push(Deparser.deparse(stmt.stmt));
     }
     return pieces.join(';\n');
@@ -181,22 +181,11 @@ export function transformExtensions(sql, router, options = {}) {
     const resolved = ExtensionRouter.from(router, options);
     const result = createExtensionResult();
     const out = transformSync(sql, (ctx) => {
-        const stmts = ctx.sql?.stmts ?? [];
-        const visitor = createExtensionVisitor(resolved, result);
-        for (const stmt of stmts) {
-            if (stmt?.stmt)
-                walkSql(stmt.stmt, visitor);
-        }
-        if (resolved.hasSymbolRoutes()) {
-            for (const fn of ctx.functions ?? []) {
-                if (fn.plpgsql?.hydrated) {
-                    walkPlpgsql(fn.plpgsql.hydrated, {}, {
-                        walkSqlExpressions: true,
-                        sqlVisitor: visitor
-                    });
-                }
-            }
-        }
+        walk(ctx, createExtensionVisitor(resolved, result), {
+            // Bodies only matter when a symbol (function/operator/type) is routed;
+            // a bare extension rename never appears inside one.
+            walkFunctionBodies: resolved.hasSymbolRoutes()
+        });
     }, { hydrate: true, pretty: true });
     return { sql: out, result };
 }

package/esm/facts.js

@@ -1,5 +1,5 @@
-import { walk as walkSql } from '@pgsql/traverse';
-import { parseSql, transformSync, walk as walkPlpgsql } from 'plpgsql-parser';
+import { walkSqlAst } from '@pgsql/traverse';
+import { parseSql, transformSync, walkPlpgsqlAst } from 'plpgsql-parser';
 const SECURITY_TAGS = new Set([
     'CreatePolicyStmt',
     'AlterPolicyStmt',
@@ -332,7 +332,7 @@ function collectSqlBodyReferences(node, facts) {
         const visitor = createFactsVisitor(facts, facts.bodyReferences);
         for (const stmt of stmts) {
             if (stmt?.stmt)
-                walkSql(stmt.stmt, visitor);
+                walkSqlAst(stmt.stmt, visitor);
         }
     }
     catch {
@@ -359,7 +359,7 @@ export function classifyStatements(sql) {
             facts.span = { start, len: stmt?.stmt_len ?? Math.max(0, sql.length - start) };
             if (stmtNode) {
                 facts.stmt = stmtNode;
-                walkSql(stmtNode, createFactsVisitor(facts));
+                walkSqlAst(stmtNode, createFactsVisitor(facts));
             }
             if (nodeTag === 'CreateFunctionStmt') {
                 collectSqlBodyReferences(node, facts);
@@ -373,7 +373,7 @@ export function classifyStatements(sql) {
             // Refs already found outside the body (signature types, defaults)
             // constrain deploy order and are not body-only.
             const outer = new Set(facts.references.map(r => `${r.schema ?? '?'}.${r.name}`));
-            walkPlpgsql(fn.plpgsql.hydrated, {
+            walkPlpgsqlAst(fn.plpgsql.hydrated, {
                 PLpgSQL_stmt_dynexecute: () => { facts.dynamicSql = true; },
                 PLpgSQL_stmt_dynfors: () => { facts.dynamicSql = true; }
             }, {

package/esm/qualify.js

@@ -14,8 +14,8 @@
  * defined by a CTE in the same statement are excluded even when they collide
  * with a routed relation.
  */
-import { walk as walkSql } from '@pgsql/traverse';
-import { Deparser, parseSql, transformSync, walk as walkPlpgsql } from 'plpgsql-parser';
+import { walkSqlAst } from '@pgsql/traverse';
+import { Deparser, parseSql, transformSync, walkPlpgsqlAst } from 'plpgsql-parser';
 import { classifyStatements } from './facts';
 const RELATION_TAGS = new Set([
     'CreateStmt',
@@ -119,7 +119,7 @@ function resolveRoutes(sql, options) {
 }
 function collectCteNames(stmt) {
     const names = new Set();
-    walkSql(stmt, {
+    walkSqlAst(stmt, {
         CommonTableExpr: (path) => {
             if (path.node?.ctename)
                 names.add(path.node.ctename);
@@ -142,7 +142,7 @@ function qualifySqlBodyString(body, routes, result) {
         if (!stmt?.stmt)
             continue;
         const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
-        walkSql(stmt.stmt, visitor);
+        walkSqlAst(stmt.stmt, visitor);
         pieces.push(Deparser.deparse(stmt.stmt));
     }
     return pieces.join(';\n');
@@ -259,13 +259,13 @@ export function qualifyUnqualified(sql, options) {
         for (const stmt of stmts) {
             if (stmt?.stmt) {
                 const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
-                walkSql(stmt.stmt, visitor);
+                walkSqlAst(stmt.stmt, visitor);
             }
         }
         const bodyVisitor = createQualifyVisitor({ routes }, result);
         for (const fn of ctx.functions) {
             if (fn.plpgsql?.hydrated) {
-                walkPlpgsql(fn.plpgsql.hydrated, {}, {
+                walkPlpgsqlAst(fn.plpgsql.hydrated, {}, {
                     walkSqlExpressions: true,
                     sqlVisitor: bodyVisitor
                 });

package/esm/role-transform.js

@@ -20,7 +20,7 @@
  * carry no `rolename` and a non-`CSTRING` `roletype`, so they are never
  * rewritten.
  */
-import { walk as walkSql } from '@pgsql/traverse';
+import { walkSqlAst } from '@pgsql/traverse';
 import { transformSync } from 'plpgsql-parser';
 import { RoleRouter } from './role-router';
 export function createRoleResult() {
@@ -122,7 +122,7 @@ export function transformRoles(sql, router) {
         const visitor = createRoleVisitor(resolved, result);
         for (const stmt of stmts) {
             if (stmt?.stmt)
-                walkSql(stmt.stmt, visitor);
+                walkSqlAst(stmt.stmt, visitor);
         }
     }, { hydrate: true, pretty: true });
     return { sql: out, result };

package/esm/transform.js

@@ -24,8 +24,8 @@
  * - Comment headers, verify function calls, JSON string values (regex fallback)
  */
 import { QuoteUtils } from '@pgsql/quotes';
-import { walk as walkSql } from '@pgsql/traverse';
-import { Deparser, parseSql, transformSync, walk as walkPlpgsql } from 'plpgsql-parser';
+import { walk, walkSqlAst } from '@pgsql/traverse';
+import { Deparser, parseSql, transformSync } from 'plpgsql-parser';
 import { qualifyUnqualified } from './qualify';
 import { captureTransformAsts, validateRoundTrip } from './round-trip';
 import { SchemaRouter } from './router';
@@ -721,7 +721,7 @@ export function transformPlpgsqlTypeAst(typname, schemaMapping, result) {
                 }
             }
         };
-        walkSql(parseResult.stmts[0].stmt, sqlVisitor);
+        walkSqlAst(parseResult.stmts[0].stmt, sqlVisitor);
         const deparsed = Deparser.deparse(parseResult.stmts[0].stmt);
         const match = deparsed.match(/SELECT\s+NULL::(.+)/i);
         if (match) {
@@ -786,7 +786,7 @@ export function walkPlpgsqlForSchemas(node, schemaMapping, result) {
             if (Array.isArray(expr.query.parseResult?.stmts)) {
                 for (const stmt of expr.query.parseResult.stmts) {
                     if (stmt?.stmt) {
-                        walkSql(stmt.stmt, sqlVisitor);
+                        walkSqlAst(stmt.stmt, sqlVisitor);
                     }
                 }
             }
@@ -807,7 +807,7 @@ export function walkPlpgsqlForSchemas(node, schemaMapping, result) {
         if (plType.typname) {
             if (typeof plType.typname === 'object' && plType.typname.kind === 'type-name') {
                 // Transform schema names directly in the typeNameNode.names array.
-                // We cannot use walkSql here because the raw typeNameNode is not
+                // We cannot use walkSqlAst here because the raw typeNameNode is not
                 // wrapped in the expected AST envelope that the traverse walker needs.
                 if (plType.typname.typeNameNode?.names) {
                     transformNameList(plType.typname.typeNameNode.names, schemaMapping, result, 'type');
@@ -849,7 +849,7 @@ function transformSqlBodyString(body, router, result) {
         for (const stmt of stmts) {
             if (!stmt?.stmt)
                 continue;
-            walkSql(stmt.stmt, visitor);
+            walkSqlAst(stmt.stmt, visitor);
             pieces.push(Deparser.deparse(stmt.stmt));
         }
         return pieces.join(';\n');
@@ -858,6 +858,20 @@ function transformSqlBodyString(body, router, result) {
         return body.includes('.') ? transformSchemaRefsInString(body, router, result) : body;
     }
 }
+/**
+ * Apply schema renaming to a hydrated parse context: every top-level statement
+ * and every hydrated PL/pgSQL body in one walk. `walkPlpgsqlForSchemas` handles
+ * what the SQL visitor cannot see — PL/pgSQL-only nodes such as declared
+ * variable types, which carry schema-qualified names as plain strings.
+ */
+function transformSchemasInContext(ctx, schemaMapping, result, visitorOptions) {
+    walk(ctx, createSqlVisitor(schemaMapping, result, visitorOptions));
+    for (const fn of ctx.functions ?? []) {
+        if (fn.plpgsql?.hydrated) {
+            walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, result);
+        }
+    }
+}
 /**
  * Escape a string for use in a regular expression
  */
@@ -1037,23 +1051,7 @@ export function transformSqlStatement(sql, schemaMapping, result) {
     }
     try {
         const transformed = transformSync(sql, (ctx) => {
-            const sqlVisitor = createSqlVisitor(schemaMapping, r);
-            if (ctx.sql?.stmts) {
-                for (const stmt of ctx.sql.stmts) {
-                    if (stmt?.stmt) {
-                        walkSql(stmt.stmt, sqlVisitor);
-                    }
-                }
-            }
-            for (const fn of ctx.functions) {
-                if (fn.plpgsql?.hydrated) {
-                    walkPlpgsql(fn.plpgsql.hydrated, {}, {
-                        walkSqlExpressions: true,
-                        sqlVisitor: sqlVisitor
-                    });
-                    walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, r);
-                }
-            }
+            transformSchemasInContext(ctx, schemaMapping, r);
         }, { hydrate: true, pretty: true });
         return { sql: transformed, result: r };
     }
@@ -1095,23 +1093,7 @@ function transformSqlContentAst(content, schemaMapping, result, options) {
         let before;
         try {
             transformedBody = transformSync(transformedBody, (ctx) => {
-                const sqlVisitor = createSqlVisitor(schemaMapping, result, { assumeSchemasExist });
-                if (ctx.sql?.stmts) {
-                    for (const stmt of ctx.sql.stmts) {
-                        if (stmt?.stmt) {
-                            walkSql(stmt.stmt, sqlVisitor);
-                        }
-                    }
-                }
-                for (const fn of ctx.functions) {
-                    if (fn.plpgsql?.hydrated) {
-                        walkPlpgsql(fn.plpgsql.hydrated, {}, {
-                            walkSqlExpressions: true,
-                            sqlVisitor: sqlVisitor
-                        });
-                        walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, result);
-                    }
-                }
+                transformSchemasInContext(ctx, schemaMapping, result, { assumeSchemasExist });
                 if (roundTrip) {
                     before = captureTransformAsts(ctx);
                 }

package/extension-transform.js

@@ -172,7 +172,7 @@ function rewriteSqlBodyString(body, router, result) {
     for (const stmt of stmts) {
         if (!stmt?.stmt)
             continue;
-        (0, traverse_1.walk)(stmt.stmt, visitor);
+        (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
         pieces.push(plpgsql_parser_1.Deparser.deparse(stmt.stmt));
     }
     return pieces.join(';\n');
@@ -186,22 +186,11 @@ function transformExtensions(sql, router, options = {}) {
     const resolved = extension_router_1.ExtensionRouter.from(router, options);
     const result = createExtensionResult();
     const out = (0, plpgsql_parser_1.transformSync)(sql, (ctx) => {
-        const stmts = ctx.sql?.stmts ?? [];
-        const visitor = createExtensionVisitor(resolved, result);
-        for (const stmt of stmts) {
-            if (stmt?.stmt)
-                (0, traverse_1.walk)(stmt.stmt, visitor);
-        }
-        if (resolved.hasSymbolRoutes()) {
-            for (const fn of ctx.functions ?? []) {
-                if (fn.plpgsql?.hydrated) {
-                    (0, plpgsql_parser_1.walk)(fn.plpgsql.hydrated, {}, {
-                        walkSqlExpressions: true,
-                        sqlVisitor: visitor
-                    });
-                }
-            }
-        }
+        (0, traverse_1.walk)(ctx, createExtensionVisitor(resolved, result), {
+            // Bodies only matter when a symbol (function/operator/type) is routed;
+            // a bare extension rename never appears inside one.
+            walkFunctionBodies: resolved.hasSymbolRoutes()
+        });
     }, { hydrate: true, pretty: true });
     return { sql: out, result };
 }

package/facts.js

@@ -335,7 +335,7 @@ function collectSqlBodyReferences(node, facts) {
         const visitor = createFactsVisitor(facts, facts.bodyReferences);
         for (const stmt of stmts) {
             if (stmt?.stmt)
-                (0, traverse_1.walk)(stmt.stmt, visitor);
+                (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
         }
     }
     catch {
@@ -362,7 +362,7 @@ function classifyStatements(sql) {
             facts.span = { start, len: stmt?.stmt_len ?? Math.max(0, sql.length - start) };
             if (stmtNode) {
                 facts.stmt = stmtNode;
-                (0, traverse_1.walk)(stmtNode, createFactsVisitor(facts));
+                (0, traverse_1.walkSqlAst)(stmtNode, createFactsVisitor(facts));
             }
             if (nodeTag === 'CreateFunctionStmt') {
                 collectSqlBodyReferences(node, facts);
@@ -376,7 +376,7 @@ function classifyStatements(sql) {
             // Refs already found outside the body (signature types, defaults)
             // constrain deploy order and are not body-only.
             const outer = new Set(facts.references.map(r => `${r.schema ?? '?'}.${r.name}`));
-            (0, plpgsql_parser_1.walk)(fn.plpgsql.hydrated, {
+            (0, plpgsql_parser_1.walkPlpgsqlAst)(fn.plpgsql.hydrated, {
                 PLpgSQL_stmt_dynexecute: () => { facts.dynamicSql = true; },
                 PLpgSQL_stmt_dynfors: () => { facts.dynamicSql = true; }
             }, {

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pgsql/transform",
-  "version": "18.11.1",
+  "version": "18.13.0",
   "author": "Constructive <developers@constructive.io>",
   "description": "AST-based SQL transformation, qualification, classification and closure analysis for PostgreSQL",
   "main": "index.js",
@@ -33,8 +33,8 @@
   },
   "dependencies": {
     "@pgsql/quotes": "18.1.0",
-    "@pgsql/traverse": "18.4.0",
-    "plpgsql-parser": "18.2.3"
+    "@pgsql/traverse": "18.6.0",
+    "plpgsql-parser": "18.4.0"
   },
   "devDependencies": {
     "makage": "^0.1.8"
@@ -49,5 +49,5 @@
     "classify",
     "plpgsql"
   ],
-  "gitHead": "884ba252cf8b074c6790b3722477acc3d6f92539"
+  "gitHead": "571af81b3e5e5582eae226053b820f9c90c898b6"
 }

package/qualify.js

@@ -125,7 +125,7 @@ function resolveRoutes(sql, options) {
 }
 function collectCteNames(stmt) {
     const names = new Set();
-    (0, traverse_1.walk)(stmt, {
+    (0, traverse_1.walkSqlAst)(stmt, {
         CommonTableExpr: (path) => {
             if (path.node?.ctename)
                 names.add(path.node.ctename);
@@ -148,7 +148,7 @@ function qualifySqlBodyString(body, routes, result) {
         if (!stmt?.stmt)
             continue;
         const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
-        (0, traverse_1.walk)(stmt.stmt, visitor);
+        (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
         pieces.push(plpgsql_parser_1.Deparser.deparse(stmt.stmt));
     }
     return pieces.join(';\n');
@@ -265,13 +265,13 @@ function qualifyUnqualified(sql, options) {
         for (const stmt of stmts) {
             if (stmt?.stmt) {
                 const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
-                (0, traverse_1.walk)(stmt.stmt, visitor);
+                (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
             }
         }
         const bodyVisitor = createQualifyVisitor({ routes }, result);
         for (const fn of ctx.functions) {
             if (fn.plpgsql?.hydrated) {
-                (0, plpgsql_parser_1.walk)(fn.plpgsql.hydrated, {}, {
+                (0, plpgsql_parser_1.walkPlpgsqlAst)(fn.plpgsql.hydrated, {}, {
                     walkSqlExpressions: true,
                     sqlVisitor: bodyVisitor
                 });

package/role-transform.js

@@ -127,7 +127,7 @@ function transformRoles(sql, router) {
         const visitor = createRoleVisitor(resolved, result);
         for (const stmt of stmts) {
             if (stmt?.stmt)
-                (0, traverse_1.walk)(stmt.stmt, visitor);
+                (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
         }
     }, { hydrate: true, pretty: true });
     return { sql: out, result };

package/transform.js

@@ -742,7 +742,7 @@ function transformPlpgsqlTypeAst(typname, schemaMapping, result) {
                 }
             }
         };
-        (0, traverse_1.walk)(parseResult.stmts[0].stmt, sqlVisitor);
+        (0, traverse_1.walkSqlAst)(parseResult.stmts[0].stmt, sqlVisitor);
         const deparsed = plpgsql_parser_1.Deparser.deparse(parseResult.stmts[0].stmt);
         const match = deparsed.match(/SELECT\s+NULL::(.+)/i);
         if (match) {
@@ -807,7 +807,7 @@ function walkPlpgsqlForSchemas(node, schemaMapping, result) {
             if (Array.isArray(expr.query.parseResult?.stmts)) {
                 for (const stmt of expr.query.parseResult.stmts) {
                     if (stmt?.stmt) {
-                        (0, traverse_1.walk)(stmt.stmt, sqlVisitor);
+                        (0, traverse_1.walkSqlAst)(stmt.stmt, sqlVisitor);
                     }
                 }
             }
@@ -828,7 +828,7 @@ function walkPlpgsqlForSchemas(node, schemaMapping, result) {
         if (plType.typname) {
             if (typeof plType.typname === 'object' && plType.typname.kind === 'type-name') {
                 // Transform schema names directly in the typeNameNode.names array.
-                // We cannot use walkSql here because the raw typeNameNode is not
+                // We cannot use walkSqlAst here because the raw typeNameNode is not
                 // wrapped in the expected AST envelope that the traverse walker needs.
                 if (plType.typname.typeNameNode?.names) {
                     transformNameList(plType.typname.typeNameNode.names, schemaMapping, result, 'type');
@@ -870,7 +870,7 @@ function transformSqlBodyString(body, router, result) {
         for (const stmt of stmts) {
             if (!stmt?.stmt)
                 continue;
-            (0, traverse_1.walk)(stmt.stmt, visitor);
+            (0, traverse_1.walkSqlAst)(stmt.stmt, visitor);
             pieces.push(plpgsql_parser_1.Deparser.deparse(stmt.stmt));
         }
         return pieces.join(';\n');
@@ -879,6 +879,20 @@ function transformSqlBodyString(body, router, result) {
         return body.includes('.') ? transformSchemaRefsInString(body, router, result) : body;
     }
 }
+/**
+ * Apply schema renaming to a hydrated parse context: every top-level statement
+ * and every hydrated PL/pgSQL body in one walk. `walkPlpgsqlForSchemas` handles
+ * what the SQL visitor cannot see — PL/pgSQL-only nodes such as declared
+ * variable types, which carry schema-qualified names as plain strings.
+ */
+function transformSchemasInContext(ctx, schemaMapping, result, visitorOptions) {
+    (0, traverse_1.walk)(ctx, createSqlVisitor(schemaMapping, result, visitorOptions));
+    for (const fn of ctx.functions ?? []) {
+        if (fn.plpgsql?.hydrated) {
+            walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, result);
+        }
+    }
+}
 /**
  * Escape a string for use in a regular expression
  */
@@ -1058,23 +1072,7 @@ function transformSqlStatement(sql, schemaMapping, result) {
     }
     try {
         const transformed = (0, plpgsql_parser_1.transformSync)(sql, (ctx) => {
-            const sqlVisitor = createSqlVisitor(schemaMapping, r);
-            if (ctx.sql?.stmts) {
-                for (const stmt of ctx.sql.stmts) {
-                    if (stmt?.stmt) {
-                        (0, traverse_1.walk)(stmt.stmt, sqlVisitor);
-                    }
-                }
-            }
-            for (const fn of ctx.functions) {
-                if (fn.plpgsql?.hydrated) {
-                    (0, plpgsql_parser_1.walk)(fn.plpgsql.hydrated, {}, {
-                        walkSqlExpressions: true,
-                        sqlVisitor: sqlVisitor
-                    });
-                    walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, r);
-                }
-            }
+            transformSchemasInContext(ctx, schemaMapping, r);
         }, { hydrate: true, pretty: true });
         return { sql: transformed, result: r };
     }
@@ -1116,23 +1114,7 @@ function transformSqlContentAst(content, schemaMapping, result, options) {
         let before;
         try {
             transformedBody = (0, plpgsql_parser_1.transformSync)(transformedBody, (ctx) => {
-                const sqlVisitor = createSqlVisitor(schemaMapping, result, { assumeSchemasExist });
-                if (ctx.sql?.stmts) {
-                    for (const stmt of ctx.sql.stmts) {
-                        if (stmt?.stmt) {
-                            (0, traverse_1.walk)(stmt.stmt, sqlVisitor);
-                        }
-                    }
-                }
-                for (const fn of ctx.functions) {
-                    if (fn.plpgsql?.hydrated) {
-                        (0, plpgsql_parser_1.walk)(fn.plpgsql.hydrated, {}, {
-                            walkSqlExpressions: true,
-                            sqlVisitor: sqlVisitor
-                        });
-                        walkPlpgsqlForSchemas(fn.plpgsql.hydrated, schemaMapping, result);
-                    }
-                }
+                transformSchemasInContext(ctx, schemaMapping, result, { assumeSchemasExist });
                 if (roundTrip) {
                     before = (0, round_trip_1.captureTransformAsts)(ctx);
                 }