@pgsql/transform 18.1.1 → 18.3.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/README.md +24 -76
- package/esm/facts.js +289 -0
- package/esm/index.js +5 -22
- package/esm/qualify.js +297 -0
- package/esm/round-trip-core.js +126 -0
- package/esm/round-trip.js +116 -0
- package/esm/transform.js +1169 -0
- package/facts.d.ts +69 -0
- package/facts.js +292 -0
- package/index.d.ts +10 -28
- package/index.js +37 -76
- package/package.json +22 -14
- package/qualify.d.ts +125 -0
- package/qualify.js +303 -0
- package/round-trip-core.d.ts +60 -0
- package/round-trip-core.js +133 -0
- package/round-trip.d.ts +47 -0
- package/round-trip.js +123 -0
- package/transform.d.ts +259 -0
- package/transform.js +1190 -0
- package/13/enums.d.ts +0 -62
- package/13/enums.js +0 -2
- package/13/types.d.ts +0 -2103
- package/13/types.js +0 -2
- package/14/enums.d.ts +0 -62
- package/14/enums.js +0 -2
- package/14/types.d.ts +0 -2164
- package/14/types.js +0 -2
- package/15/enums.d.ts +0 -64
- package/15/enums.js +0 -2
- package/15/types.d.ts +0 -2222
- package/15/types.js +0 -2
- package/16/enums.d.ts +0 -69
- package/16/enums.js +0 -2
- package/16/types.d.ts +0 -2328
- package/16/types.js +0 -2
- package/17/enums.d.ts +0 -76
- package/17/enums.js +0 -2
- package/17/types.d.ts +0 -2488
- package/17/types.js +0 -2
- package/18/enums.d.ts +0 -78
- package/18/enums.js +0 -2
- package/18/types.d.ts +0 -2538
- package/18/types.js +0 -2
- package/esm/13/enums.js +0 -1
- package/esm/13/types.js +0 -1
- package/esm/14/enums.js +0 -1
- package/esm/14/types.js +0 -1
- package/esm/15/enums.js +0 -1
- package/esm/15/types.js +0 -1
- package/esm/16/enums.js +0 -1
- package/esm/16/types.js +0 -1
- package/esm/17/enums.js +0 -1
- package/esm/17/types.js +0 -1
- package/esm/18/enums.js +0 -1
- package/esm/18/types.js +0 -1
- package/esm/multi-version-transformer.js +0 -80
- package/esm/transformers/context.js +0 -1
- package/esm/transformers/v13-to-v14.js +0 -2767
- package/esm/transformers/v14-to-v15.js +0 -1218
- package/esm/transformers/v15-to-v16.js +0 -2935
- package/esm/transformers/v16-to-v17.js +0 -1526
- package/esm/transformers/v17-to-v18.js +0 -204
- package/esm/transformers-direct/index.js +0 -13
- package/esm/transformers-direct/v13-to-v17/index.js +0 -74
- package/esm/transformers-direct/v13-to-v18/index.js +0 -84
- package/esm/transformers-direct/v14-to-v17/index.js +0 -63
- package/esm/transformers-direct/v14-to-v18/index.js +0 -73
- package/esm/transformers-direct/v15-to-v17/index.js +0 -53
- package/esm/transformers-direct/v15-to-v18/index.js +0 -62
- package/esm/transformers-direct/v16-to-v17/index.js +0 -40
- package/esm/transformers-direct/v16-to-v18/index.js +0 -51
- package/esm/transformers-direct/v17-to-v18/index.js +0 -39
- package/multi-version-transformer.d.ts +0 -14
- package/multi-version-transformer.js +0 -84
- package/transformers/context.d.ts +0 -4
- package/transformers/context.js +0 -2
- package/transformers/v13-to-v14.d.ts +0 -255
- package/transformers/v13-to-v14.js +0 -2771
- package/transformers/v14-to-v15.d.ts +0 -615
- package/transformers/v14-to-v15.js +0 -1222
- package/transformers/v15-to-v16.d.ts +0 -632
- package/transformers/v15-to-v16.js +0 -2939
- package/transformers/v16-to-v17.d.ts +0 -640
- package/transformers/v16-to-v17.js +0 -1530
- package/transformers/v17-to-v18.d.ts +0 -54
- package/transformers/v17-to-v18.js +0 -208
- package/transformers-direct/index.d.ts +0 -13
- package/transformers-direct/index.js +0 -25
- package/transformers-direct/v13-to-v17/index.d.ts +0 -27
- package/transformers-direct/v13-to-v17/index.js +0 -78
- package/transformers-direct/v13-to-v18/index.d.ts +0 -28
- package/transformers-direct/v13-to-v18/index.js +0 -88
- package/transformers-direct/v14-to-v17/index.d.ts +0 -26
- package/transformers-direct/v14-to-v17/index.js +0 -67
- package/transformers-direct/v14-to-v18/index.d.ts +0 -27
- package/transformers-direct/v14-to-v18/index.js +0 -77
- package/transformers-direct/v15-to-v17/index.d.ts +0 -25
- package/transformers-direct/v15-to-v17/index.js +0 -57
- package/transformers-direct/v15-to-v18/index.d.ts +0 -26
- package/transformers-direct/v15-to-v18/index.js +0 -66
- package/transformers-direct/v16-to-v17/index.d.ts +0 -24
- package/transformers-direct/v16-to-v17/index.js +0 -44
- package/transformers-direct/v16-to-v18/index.d.ts +0 -25
- package/transformers-direct/v16-to-v18/index.js +0 -55
- package/transformers-direct/v17-to-v18/index.d.ts +0 -24
- package/transformers-direct/v17-to-v18/index.js +0 -43
package/esm/qualify.js
ADDED
|
@@ -0,0 +1,297 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Opt-in qualification of unqualified object references.
|
|
3
|
+
*
|
|
4
|
+
* Handwritten SQL is typically unqualified — objects implicitly land in (and
|
|
5
|
+
* resolve against) the `public` schema. The core schema transform only
|
|
6
|
+
* rewrites *explicitly* qualified references, so ingesting such code into
|
|
7
|
+
* named schemas needs a prior pass that pins every unqualified reference to a
|
|
8
|
+
* schema first. This module provides that pass.
|
|
9
|
+
*
|
|
10
|
+
* Safety model: only routed names are qualified — either everything in an
|
|
11
|
+
* {@link ObjectInventory} to a single schema, or per-object routes via
|
|
12
|
+
* `targets`. Builtin functions (`now()`, `count(...)`), builtin types, and
|
|
13
|
+
* column references are never touched because they are not routed. Names
|
|
14
|
+
* defined by a CTE in the same statement are excluded even when they collide
|
|
15
|
+
* with a routed relation.
|
|
16
|
+
*/
|
|
17
|
+
import { walk as walkSql } from '@pgsql/traverse';
|
|
18
|
+
import { Deparser, parseSql, transformSync, walk as walkPlpgsql } from 'plpgsql-parser';
|
|
19
|
+
import { classifyStatements } from './facts';
|
|
20
|
+
const RELATION_TAGS = new Set([
|
|
21
|
+
'CreateStmt',
|
|
22
|
+
'ViewStmt',
|
|
23
|
+
'CreateSeqStmt',
|
|
24
|
+
'CreateTableAsStmt'
|
|
25
|
+
]);
|
|
26
|
+
const TYPE_TAGS = new Set([
|
|
27
|
+
'CreateEnumStmt',
|
|
28
|
+
'CreateDomainStmt',
|
|
29
|
+
'CreateRangeStmt',
|
|
30
|
+
'CompositeTypeStmt'
|
|
31
|
+
]);
|
|
32
|
+
/**
|
|
33
|
+
* Collect the objects a SQL script creates, bucketed for qualification.
|
|
34
|
+
* Only unqualified (schema-less) creations are collected — an explicitly
|
|
35
|
+
* qualified creation already declares where it lives.
|
|
36
|
+
*/
|
|
37
|
+
export function collectCreatedObjects(sql) {
|
|
38
|
+
const inventory = {
|
|
39
|
+
relations: new Set(),
|
|
40
|
+
functions: new Set(),
|
|
41
|
+
types: new Set()
|
|
42
|
+
};
|
|
43
|
+
for (const facts of classifyStatements(sql)) {
|
|
44
|
+
for (const created of facts.creates) {
|
|
45
|
+
if (created.schema)
|
|
46
|
+
continue;
|
|
47
|
+
if (RELATION_TAGS.has(facts.nodeTag)) {
|
|
48
|
+
inventory.relations.add(created.name);
|
|
49
|
+
}
|
|
50
|
+
else if (facts.nodeTag === 'CreateFunctionStmt') {
|
|
51
|
+
inventory.functions.add(created.name);
|
|
52
|
+
}
|
|
53
|
+
else if (TYPE_TAGS.has(facts.nodeTag)) {
|
|
54
|
+
inventory.types.add(created.name);
|
|
55
|
+
}
|
|
56
|
+
}
|
|
57
|
+
}
|
|
58
|
+
return inventory;
|
|
59
|
+
}
|
|
60
|
+
/** Merge inventories collected from multiple scripts. */
|
|
61
|
+
export function mergeInventories(inventories) {
|
|
62
|
+
const merged = {
|
|
63
|
+
relations: new Set(),
|
|
64
|
+
functions: new Set(),
|
|
65
|
+
types: new Set()
|
|
66
|
+
};
|
|
67
|
+
for (const inv of inventories) {
|
|
68
|
+
for (const name of inv.relations)
|
|
69
|
+
merged.relations.add(name);
|
|
70
|
+
for (const name of inv.functions)
|
|
71
|
+
merged.functions.add(name);
|
|
72
|
+
for (const name of inv.types)
|
|
73
|
+
merged.types.add(name);
|
|
74
|
+
}
|
|
75
|
+
return merged;
|
|
76
|
+
}
|
|
77
|
+
/** Resolve the routing table from the option forms. */
|
|
78
|
+
function resolveRoutes(sql, options) {
|
|
79
|
+
if (options.targets && options.schema) {
|
|
80
|
+
throw new Error('qualifyUnqualified: pass either `schema` or `targets`, not both');
|
|
81
|
+
}
|
|
82
|
+
const routes = {
|
|
83
|
+
relations: new Map(),
|
|
84
|
+
functions: new Map(),
|
|
85
|
+
types: new Map()
|
|
86
|
+
};
|
|
87
|
+
const route = (bucket, namespace, name, schema) => {
|
|
88
|
+
const existing = bucket.get(name);
|
|
89
|
+
if (existing && existing !== schema) {
|
|
90
|
+
throw new Error(`qualifyUnqualified: conflicting targets for ${namespace} "${name}": ${existing} vs ${schema}`);
|
|
91
|
+
}
|
|
92
|
+
bucket.set(name, schema);
|
|
93
|
+
};
|
|
94
|
+
if (options.targets) {
|
|
95
|
+
if (options.inventory) {
|
|
96
|
+
throw new Error('qualifyUnqualified: `inventory` only applies to the `schema` form');
|
|
97
|
+
}
|
|
98
|
+
for (const [schema, selector] of Object.entries(options.targets)) {
|
|
99
|
+
for (const name of selector.relations ?? [])
|
|
100
|
+
route(routes.relations, 'relation', name, schema);
|
|
101
|
+
for (const name of selector.functions ?? [])
|
|
102
|
+
route(routes.functions, 'function', name, schema);
|
|
103
|
+
for (const name of selector.types ?? [])
|
|
104
|
+
route(routes.types, 'type', name, schema);
|
|
105
|
+
}
|
|
106
|
+
return routes;
|
|
107
|
+
}
|
|
108
|
+
if (!options.schema) {
|
|
109
|
+
throw new Error('qualifyUnqualified: one of `schema` or `targets` is required');
|
|
110
|
+
}
|
|
111
|
+
const inventory = options.inventory ?? collectCreatedObjects(sql);
|
|
112
|
+
for (const name of inventory.relations)
|
|
113
|
+
routes.relations.set(name, options.schema);
|
|
114
|
+
for (const name of inventory.functions)
|
|
115
|
+
routes.functions.set(name, options.schema);
|
|
116
|
+
for (const name of inventory.types)
|
|
117
|
+
routes.types.set(name, options.schema);
|
|
118
|
+
return routes;
|
|
119
|
+
}
|
|
120
|
+
function collectCteNames(stmt) {
|
|
121
|
+
const names = new Set();
|
|
122
|
+
walkSql(stmt, {
|
|
123
|
+
CommonTableExpr: (path) => {
|
|
124
|
+
if (path.node?.ctename)
|
|
125
|
+
names.add(path.node.ctename);
|
|
126
|
+
}
|
|
127
|
+
});
|
|
128
|
+
return names;
|
|
129
|
+
}
|
|
130
|
+
/**
|
|
131
|
+
* Qualify unqualified references inside a LANGUAGE sql function body string.
|
|
132
|
+
* (`AS $$...$$` is a String under the 'as' DefElem; only PL/pgSQL bodies are
|
|
133
|
+
* exposed as a hydrated AST, so sql-language bodies need their own parse.)
|
|
134
|
+
*/
|
|
135
|
+
function qualifySqlBodyString(body, routes, result) {
|
|
136
|
+
const parseResult = parseSql(body);
|
|
137
|
+
const stmts = parseResult?.stmts ?? [];
|
|
138
|
+
if (stmts.length === 0)
|
|
139
|
+
return body;
|
|
140
|
+
const pieces = [];
|
|
141
|
+
for (const stmt of stmts) {
|
|
142
|
+
if (!stmt?.stmt)
|
|
143
|
+
continue;
|
|
144
|
+
const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
|
|
145
|
+
walkSql(stmt.stmt, visitor);
|
|
146
|
+
pieces.push(Deparser.deparse(stmt.stmt));
|
|
147
|
+
}
|
|
148
|
+
return pieces.join(';\n');
|
|
149
|
+
}
|
|
150
|
+
function schemaStringNode(schema) {
|
|
151
|
+
return { String: { sval: schema } };
|
|
152
|
+
}
|
|
153
|
+
/**
|
|
154
|
+
* Create a SQL AST visitor that qualifies unqualified references against a
|
|
155
|
+
* routing table. Composable with the walkers used by the core transform.
|
|
156
|
+
*/
|
|
157
|
+
export function createQualifyVisitor(options, result) {
|
|
158
|
+
const { routes } = options;
|
|
159
|
+
const cteNames = options.cteNames ?? new Set();
|
|
160
|
+
const typeSchemaOf = (name) => routes.types.get(name) ?? routes.relations.get(name);
|
|
161
|
+
const record = (name, schema) => {
|
|
162
|
+
result.qualified.set(name, (result.qualified.get(name) ?? 0) + 1);
|
|
163
|
+
result.routed.set(name, schema);
|
|
164
|
+
};
|
|
165
|
+
const qualifyNameList = (names, schemaOf) => {
|
|
166
|
+
if (!names || names.length !== 1)
|
|
167
|
+
return;
|
|
168
|
+
const name = names[0]?.String?.sval;
|
|
169
|
+
if (!name)
|
|
170
|
+
return;
|
|
171
|
+
const schema = schemaOf(name);
|
|
172
|
+
if (schema) {
|
|
173
|
+
names.unshift(schemaStringNode(schema));
|
|
174
|
+
record(name, schema);
|
|
175
|
+
}
|
|
176
|
+
};
|
|
177
|
+
const functionSchemaOf = (name) => routes.functions.get(name);
|
|
178
|
+
return {
|
|
179
|
+
RangeVar: (path) => {
|
|
180
|
+
const node = path.node;
|
|
181
|
+
if (!node.schemaname && node.relname && !cteNames.has(node.relname)) {
|
|
182
|
+
const schema = routes.relations.get(node.relname);
|
|
183
|
+
if (schema) {
|
|
184
|
+
node.schemaname = schema;
|
|
185
|
+
record(node.relname, schema);
|
|
186
|
+
}
|
|
187
|
+
}
|
|
188
|
+
},
|
|
189
|
+
FuncCall: (path) => {
|
|
190
|
+
qualifyNameList(path.node.funcname, functionSchemaOf);
|
|
191
|
+
},
|
|
192
|
+
CallStmt: (path) => {
|
|
193
|
+
// The walker does not auto-recurse into CallStmt.funccall.
|
|
194
|
+
if (path.node.funccall) {
|
|
195
|
+
qualifyNameList(path.node.funccall.funcname, functionSchemaOf);
|
|
196
|
+
}
|
|
197
|
+
},
|
|
198
|
+
TypeName: (path) => {
|
|
199
|
+
qualifyNameList(path.node.names, typeSchemaOf);
|
|
200
|
+
},
|
|
201
|
+
CreateFunctionStmt: (path) => {
|
|
202
|
+
const node = path.node;
|
|
203
|
+
qualifyNameList(node.funcname, functionSchemaOf);
|
|
204
|
+
// LANGUAGE sql bodies are opaque strings to the walker; parse and
|
|
205
|
+
// qualify them separately (plpgsql bodies ride the hydrated AST walk).
|
|
206
|
+
const isPlpgsql = (node.options ?? []).some((opt) => opt?.DefElem?.defname === 'language' &&
|
|
207
|
+
opt.DefElem.arg?.String?.sval === 'plpgsql');
|
|
208
|
+
if (!isPlpgsql && Array.isArray(node.options)) {
|
|
209
|
+
for (const opt of node.options) {
|
|
210
|
+
if (opt?.DefElem?.defname === 'as' && opt.DefElem.arg?.List?.items) {
|
|
211
|
+
for (const item of opt.DefElem.arg.List.items) {
|
|
212
|
+
if (typeof item?.String?.sval === 'string') {
|
|
213
|
+
try {
|
|
214
|
+
item.String.sval = qualifySqlBodyString(item.String.sval, routes, result);
|
|
215
|
+
}
|
|
216
|
+
catch {
|
|
217
|
+
// Not parseable standalone (e.g. C symbol names) — leave as-is.
|
|
218
|
+
}
|
|
219
|
+
}
|
|
220
|
+
}
|
|
221
|
+
}
|
|
222
|
+
}
|
|
223
|
+
}
|
|
224
|
+
},
|
|
225
|
+
CreateTrigStmt: (path) => {
|
|
226
|
+
qualifyNameList(path.node.funcname, functionSchemaOf);
|
|
227
|
+
},
|
|
228
|
+
ObjectWithArgs: (path) => {
|
|
229
|
+
qualifyNameList(path.node.objname, functionSchemaOf);
|
|
230
|
+
},
|
|
231
|
+
CreateEnumStmt: (path) => {
|
|
232
|
+
qualifyNameList(path.node.typeName, name => routes.types.get(name));
|
|
233
|
+
},
|
|
234
|
+
CreateRangeStmt: (path) => {
|
|
235
|
+
qualifyNameList(path.node.typeName, name => routes.types.get(name));
|
|
236
|
+
},
|
|
237
|
+
CreateDomainStmt: (path) => {
|
|
238
|
+
qualifyNameList(path.node.domainname, name => routes.types.get(name));
|
|
239
|
+
}
|
|
240
|
+
};
|
|
241
|
+
}
|
|
242
|
+
/**
|
|
243
|
+
* Qualify unqualified references in a SQL string.
|
|
244
|
+
*
|
|
245
|
+
* Two forms:
|
|
246
|
+
* - `{ schema, inventory? }` — pin every inventoried name to one schema.
|
|
247
|
+
* - `{ targets }` — route specific objects to specific schemas in one pass.
|
|
248
|
+
*
|
|
249
|
+
* Runs as a standalone AST pass (parse → qualify → deparse). To combine with
|
|
250
|
+
* a schema rename, run this first (typically with `schema: 'public'`) and
|
|
251
|
+
* then map via the core transform — or use the `qualifyUnqualified` option on
|
|
252
|
+
* `transformSql`, which does exactly that.
|
|
253
|
+
*/
|
|
254
|
+
export function qualifyUnqualified(sql, options) {
|
|
255
|
+
const result = { qualified: new Map(), routed: new Map() };
|
|
256
|
+
const routes = resolveRoutes(sql, options);
|
|
257
|
+
let qualified = transformSync(sql, (ctx) => {
|
|
258
|
+
const stmts = ctx.sql?.stmts ?? [];
|
|
259
|
+
for (const stmt of stmts) {
|
|
260
|
+
if (stmt?.stmt) {
|
|
261
|
+
const visitor = createQualifyVisitor({ routes, cteNames: collectCteNames(stmt.stmt) }, result);
|
|
262
|
+
walkSql(stmt.stmt, visitor);
|
|
263
|
+
}
|
|
264
|
+
}
|
|
265
|
+
const bodyVisitor = createQualifyVisitor({ routes }, result);
|
|
266
|
+
for (const fn of ctx.functions) {
|
|
267
|
+
if (fn.plpgsql?.hydrated) {
|
|
268
|
+
walkPlpgsql(fn.plpgsql.hydrated, {}, {
|
|
269
|
+
walkSqlExpressions: true,
|
|
270
|
+
sqlVisitor: bodyVisitor
|
|
271
|
+
});
|
|
272
|
+
}
|
|
273
|
+
}
|
|
274
|
+
}, { hydrate: true, pretty: true });
|
|
275
|
+
if (options.injectCreateSchema) {
|
|
276
|
+
const targetSchemas = new Set([
|
|
277
|
+
...routes.relations.values(),
|
|
278
|
+
...routes.functions.values(),
|
|
279
|
+
...routes.types.values()
|
|
280
|
+
]);
|
|
281
|
+
const created = new Set();
|
|
282
|
+
for (const facts of classifyStatements(qualified)) {
|
|
283
|
+
if (facts.nodeTag === 'CreateSchemaStmt') {
|
|
284
|
+
for (const createdSchema of facts.creates)
|
|
285
|
+
created.add(createdSchema.name);
|
|
286
|
+
}
|
|
287
|
+
}
|
|
288
|
+
const missing = [...targetSchemas].filter(schema => !created.has(schema)).sort();
|
|
289
|
+
if (missing.length > 0) {
|
|
290
|
+
const prelude = missing
|
|
291
|
+
.map(schema => `CREATE SCHEMA IF NOT EXISTS ${schema};`)
|
|
292
|
+
.join('\n');
|
|
293
|
+
qualified = `${prelude}\n\n${qualified}`;
|
|
294
|
+
}
|
|
295
|
+
}
|
|
296
|
+
return { sql: qualified, result };
|
|
297
|
+
}
|
|
@@ -0,0 +1,126 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Shared, dependency-free core for round-trip AST validation.
|
|
3
|
+
*
|
|
4
|
+
* This module is intentionally self-contained — it imports no parser or
|
|
5
|
+
* deparser — so it can be lifted verbatim into an upstream package (e.g.
|
|
6
|
+
* `@pgsql/round-trip`) and shared between:
|
|
7
|
+
*
|
|
8
|
+
* - pgsql-parser's test fixtures (`cleanTree` / `expectParseDeparse`), which
|
|
9
|
+
* parse → deparse → re-parse and assert the normalized ASTs are equal, and
|
|
10
|
+
* - downstream mutation-aware validators (this package's
|
|
11
|
+
* round-trip check), which compare a *mutated* AST against the AST obtained
|
|
12
|
+
* by re-parsing the deparsed output.
|
|
13
|
+
*
|
|
14
|
+
* The upstream `cleanTree` is expressed here as a preset over the generic
|
|
15
|
+
* `normalizeTree` engine; the downstream fortified normalizer layers extra
|
|
16
|
+
* volatile keys, lazy-datum filtering, and body-sentinel handling on top of
|
|
17
|
+
* the same engine (see round-trip.ts).
|
|
18
|
+
*/
|
|
19
|
+
/**
|
|
20
|
+
* Deep-clone an AST while dropping volatile keys, optionally sorting keys,
|
|
21
|
+
* filtering array items, and applying per-key transform hooks. Primitives are
|
|
22
|
+
* returned as-is; Dates are cloned (parity with the original upstream
|
|
23
|
+
* `transform` helper).
|
|
24
|
+
*/
|
|
25
|
+
export function normalizeTree(node, options = {}) {
|
|
26
|
+
const { volatileKeys, sortKeys, dropArrayItem, keyHandlers } = options;
|
|
27
|
+
const recurse = (n) => normalizeTree(n, options);
|
|
28
|
+
if (Array.isArray(node)) {
|
|
29
|
+
const items = dropArrayItem ? node.filter((i) => !dropArrayItem(i)) : node;
|
|
30
|
+
return items.map(recurse);
|
|
31
|
+
}
|
|
32
|
+
if (node instanceof Date) {
|
|
33
|
+
return new Date(node.getTime());
|
|
34
|
+
}
|
|
35
|
+
if (node && typeof node === 'object') {
|
|
36
|
+
const out = {};
|
|
37
|
+
const keys = sortKeys ? Object.keys(node).sort() : Object.keys(node);
|
|
38
|
+
for (const key of keys) {
|
|
39
|
+
if (volatileKeys?.has(key))
|
|
40
|
+
continue;
|
|
41
|
+
const handler = keyHandlers?.[key];
|
|
42
|
+
out[key] = handler ? handler(node[key], recurse) : recurse(node[key]);
|
|
43
|
+
}
|
|
44
|
+
return out;
|
|
45
|
+
}
|
|
46
|
+
return node;
|
|
47
|
+
}
|
|
48
|
+
/**
|
|
49
|
+
* Return the JSON path of the first structural difference between two trees,
|
|
50
|
+
* or null if they are deeply equal. Useful for actionable mismatch messages.
|
|
51
|
+
*/
|
|
52
|
+
export function firstDifference(a, b, path = '$') {
|
|
53
|
+
if (a === b)
|
|
54
|
+
return null;
|
|
55
|
+
if (Array.isArray(a) && Array.isArray(b)) {
|
|
56
|
+
if (a.length !== b.length) {
|
|
57
|
+
return `${path} (array length ${a.length} vs ${b.length})`;
|
|
58
|
+
}
|
|
59
|
+
for (let i = 0; i < a.length; i++) {
|
|
60
|
+
const diff = firstDifference(a[i], b[i], `${path}[${i}]`);
|
|
61
|
+
if (diff)
|
|
62
|
+
return diff;
|
|
63
|
+
}
|
|
64
|
+
return null;
|
|
65
|
+
}
|
|
66
|
+
if (a && b && typeof a === 'object' && typeof b === 'object') {
|
|
67
|
+
const keys = new Set([...Object.keys(a), ...Object.keys(b)]);
|
|
68
|
+
for (const key of keys) {
|
|
69
|
+
const diff = firstDifference(a[key], b[key], `${path}.${key}`);
|
|
70
|
+
if (diff)
|
|
71
|
+
return diff;
|
|
72
|
+
}
|
|
73
|
+
return null;
|
|
74
|
+
}
|
|
75
|
+
return `${path} (${JSON.stringify(a)} vs ${JSON.stringify(b)})`;
|
|
76
|
+
}
|
|
77
|
+
// ---------------------------------------------------------------------------
|
|
78
|
+
// Upstream-compatible cleanTree preset
|
|
79
|
+
// ---------------------------------------------------------------------------
|
|
80
|
+
/** Position/length fields stripped by the upstream `cleanTree`. */
|
|
81
|
+
export const CLEAN_TREE_VOLATILE_KEYS = new Set([
|
|
82
|
+
'stmt_len',
|
|
83
|
+
'stmt_location',
|
|
84
|
+
'location',
|
|
85
|
+
'rexpr_list_start',
|
|
86
|
+
'rexpr_list_end',
|
|
87
|
+
'list_start',
|
|
88
|
+
'list_end',
|
|
89
|
+
]);
|
|
90
|
+
/**
|
|
91
|
+
* Trim the function/DO body string carried by a `DefElem` with defname "as".
|
|
92
|
+
* Mirrors the in-place trimming in pgsql-parser's `cleanTree` so the body
|
|
93
|
+
* text (whose surrounding whitespace legitimately shifts on deparse) does not
|
|
94
|
+
* cause spurious AST mismatches. Mutates the passed DefElem in place.
|
|
95
|
+
*/
|
|
96
|
+
export function trimDefElemBody(defElem) {
|
|
97
|
+
if (!defElem || defElem.defname !== 'as')
|
|
98
|
+
return;
|
|
99
|
+
const arg = defElem.arg;
|
|
100
|
+
if (Array.isArray(arg) && arg.length && arg[0]?.String) {
|
|
101
|
+
arg[0].String.sval = arg[0].String.sval.trim();
|
|
102
|
+
}
|
|
103
|
+
else if (arg?.List?.items?.length && arg.List.items[0]?.String) {
|
|
104
|
+
arg.List.items[0].String.sval = arg.List.items[0].String.sval.trim();
|
|
105
|
+
}
|
|
106
|
+
else if (arg?.String) {
|
|
107
|
+
arg.String.sval = arg.String.sval.trim();
|
|
108
|
+
}
|
|
109
|
+
}
|
|
110
|
+
/**
|
|
111
|
+
* Upstream-compatible normalization: strips `stmt_len` / `stmt_location` /
|
|
112
|
+
* `location` and trims `DefElem` "as" body strings. Equivalent to
|
|
113
|
+
* pgsql-parser's deparser `cleanTree`, provided here so upstream can adopt the
|
|
114
|
+
* shared core without behavior change.
|
|
115
|
+
*/
|
|
116
|
+
export function cleanTree(tree) {
|
|
117
|
+
return normalizeTree(tree, {
|
|
118
|
+
volatileKeys: CLEAN_TREE_VOLATILE_KEYS,
|
|
119
|
+
keyHandlers: {
|
|
120
|
+
DefElem: (defElem, recurse) => {
|
|
121
|
+
trimDefElemBody(defElem);
|
|
122
|
+
return recurse(defElem);
|
|
123
|
+
},
|
|
124
|
+
},
|
|
125
|
+
});
|
|
126
|
+
}
|
|
@@ -0,0 +1,116 @@
|
|
|
1
|
+
/**
|
|
2
|
+
* Round-trip validation for the schema transform.
|
|
3
|
+
*
|
|
4
|
+
* After the transform deparses its mutated AST to SQL text, the emitted text
|
|
5
|
+
* must parse back to an AST that is structurally identical to the AST we
|
|
6
|
+
* deparsed (AST1 === AST2 after normalization). Any mismatch means the
|
|
7
|
+
* deparser dropped or mangled something (e.g. array bounds on a DECLAREd
|
|
8
|
+
* type), even though the output may still be syntactically valid SQL.
|
|
9
|
+
*
|
|
10
|
+
* Two comparisons are performed per file:
|
|
11
|
+
* - the SQL-level parse tree (with volatile fields and function body strings
|
|
12
|
+
* normalized — PL/pgSQL bodies are compared separately)
|
|
13
|
+
* - each PL/pgSQL function body, compared in dehydrated form so both sides
|
|
14
|
+
* go through the same hydrate -> dehydrate rendering
|
|
15
|
+
*/
|
|
16
|
+
import { dehydratePlpgsqlAst, transformSync } from 'plpgsql-parser';
|
|
17
|
+
import { CLEAN_TREE_VOLATILE_KEYS, firstDifference, normalizeTree, } from './round-trip-core';
|
|
18
|
+
export { firstDifference };
|
|
19
|
+
/**
|
|
20
|
+
* Fields that legitimately differ between parses. Extends the upstream
|
|
21
|
+
* `cleanTree` volatile set (location/stmt_location/stmt_len) with:
|
|
22
|
+
* - lineno: source positions in PL/pgSQL nodes
|
|
23
|
+
* - dno/varno/recparentno: PL/pgSQL datum numbers — compiler bookkeeping
|
|
24
|
+
* assigned in parse-encounter order, which shifts when the deparser
|
|
25
|
+
* emits an equivalent-but-reordered statement (e.g. INTO placement).
|
|
26
|
+
* Structural identity is still checked via names/fieldnames.
|
|
27
|
+
*/
|
|
28
|
+
const VOLATILE_KEYS = new Set([
|
|
29
|
+
...CLEAN_TREE_VOLATILE_KEYS,
|
|
30
|
+
'lineno',
|
|
31
|
+
'dno',
|
|
32
|
+
'varno',
|
|
33
|
+
'recparentno',
|
|
34
|
+
]);
|
|
35
|
+
/**
|
|
36
|
+
* PLpgSQL_recfield datums are created lazily by the PL/pgSQL compiler as
|
|
37
|
+
* record.field references are encountered while parsing expressions, so
|
|
38
|
+
* their presence/order in the datums array depends on expression text
|
|
39
|
+
* layout, not semantics.
|
|
40
|
+
*/
|
|
41
|
+
function isRecfieldDatum(node) {
|
|
42
|
+
return !!node && typeof node === 'object' && 'PLpgSQL_recfield' in node;
|
|
43
|
+
}
|
|
44
|
+
/**
|
|
45
|
+
* Fortified, mutation-aware normalizer built on the shared round-trip core.
|
|
46
|
+
* Beyond the upstream `cleanTree` (position stripping + body trimming), it
|
|
47
|
+
* additionally sorts keys, drops lazily-created recfield datums, and replaces
|
|
48
|
+
* DefElem "as" bodies with a sentinel (PL/pgSQL body fidelity is checked
|
|
49
|
+
* separately via the dehydrated PL/pgSQL ASTs).
|
|
50
|
+
*/
|
|
51
|
+
export function normalizeParseTree(node) {
|
|
52
|
+
return normalizeTree(node, {
|
|
53
|
+
volatileKeys: VOLATILE_KEYS,
|
|
54
|
+
sortKeys: true,
|
|
55
|
+
dropArrayItem: isRecfieldDatum,
|
|
56
|
+
keyHandlers: {
|
|
57
|
+
DefElem: (defElem, recurse) => defElem?.defname === 'as'
|
|
58
|
+
? { ...recurse(defElem), arg: '<body>' }
|
|
59
|
+
: recurse(defElem),
|
|
60
|
+
},
|
|
61
|
+
});
|
|
62
|
+
}
|
|
63
|
+
/**
|
|
64
|
+
* Capture the normalized SQL parse tree and dehydrated PL/pgSQL function
|
|
65
|
+
* ASTs from a transform context (as produced by plpgsql-parser's
|
|
66
|
+
* transformSync callback). Call this AFTER mutating the context.
|
|
67
|
+
*/
|
|
68
|
+
export function captureTransformAsts(ctx) {
|
|
69
|
+
const plpgsqlAsts = [];
|
|
70
|
+
for (const fn of ctx.functions) {
|
|
71
|
+
if (fn.plpgsql?.hydrated) {
|
|
72
|
+
plpgsqlAsts.push(normalizeParseTree(dehydratePlpgsqlAst(structuredClone(fn.plpgsql.hydrated))));
|
|
73
|
+
}
|
|
74
|
+
}
|
|
75
|
+
return {
|
|
76
|
+
sqlAst: normalizeParseTree(ctx.sql),
|
|
77
|
+
plpgsqlAsts,
|
|
78
|
+
};
|
|
79
|
+
}
|
|
80
|
+
/**
|
|
81
|
+
* Parse already-transformed SQL text and capture its ASTs the same way
|
|
82
|
+
* capture_transform_asts does for the pre-deparse context, so the two
|
|
83
|
+
* sides are directly comparable.
|
|
84
|
+
*/
|
|
85
|
+
export function captureAstsFromSql(sql) {
|
|
86
|
+
let captured;
|
|
87
|
+
transformSync(sql, (ctx) => {
|
|
88
|
+
captured = captureTransformAsts(ctx);
|
|
89
|
+
}, { hydrate: true, pretty: true });
|
|
90
|
+
if (!captured) {
|
|
91
|
+
throw new Error('round-trip: failed to capture ASTs from transformed SQL');
|
|
92
|
+
}
|
|
93
|
+
return captured;
|
|
94
|
+
}
|
|
95
|
+
/**
|
|
96
|
+
* Assert that the transformed AST (captured before deparse) matches the AST
|
|
97
|
+
* obtained by re-parsing the emitted SQL. Throws with the first differing
|
|
98
|
+
* path on mismatch.
|
|
99
|
+
*/
|
|
100
|
+
export function validateRoundTrip(before, transformedSql) {
|
|
101
|
+
const after = captureAstsFromSql(transformedSql);
|
|
102
|
+
const sqlDiff = firstDifference(before.sqlAst, after.sqlAst);
|
|
103
|
+
if (sqlDiff) {
|
|
104
|
+
throw new Error(`round-trip validation failed: SQL AST mismatch after deparse at ${sqlDiff}`);
|
|
105
|
+
}
|
|
106
|
+
if (before.plpgsqlAsts.length !== after.plpgsqlAsts.length) {
|
|
107
|
+
throw new Error(`round-trip validation failed: PL/pgSQL function count mismatch ` +
|
|
108
|
+
`(${before.plpgsqlAsts.length} before deparse vs ${after.plpgsqlAsts.length} after re-parse)`);
|
|
109
|
+
}
|
|
110
|
+
for (let i = 0; i < before.plpgsqlAsts.length; i++) {
|
|
111
|
+
const diff = firstDifference(before.plpgsqlAsts[i], after.plpgsqlAsts[i]);
|
|
112
|
+
if (diff) {
|
|
113
|
+
throw new Error(`round-trip validation failed: PL/pgSQL AST mismatch in function #${i} at ${diff}`);
|
|
114
|
+
}
|
|
115
|
+
}
|
|
116
|
+
}
|