Skip to content

Commit 0823a3a

Browse files
committed
pg_catalog
1 parent 8ba7711 commit 0823a3a

File tree

2 files changed

+40
-30
lines changed

2 files changed

+40
-30
lines changed

packages/transform/__tests__/kitchen-sink/15-16/original-upstream-json.test.ts

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -243,32 +243,32 @@ it('original-upstream-json', async () => {
243243
"original/upstream/json-237.sql",
244244
"original/upstream/json-238.sql",
245245
"original/upstream/json-239.sql",
246-
// "original/upstream/json-240.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
247-
// "original/upstream/json-241.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
248-
// "original/upstream/json-242.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
249-
// "original/upstream/json-243.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
250-
// "original/upstream/json-244.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
251-
// "original/upstream/json-245.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
252-
// "original/upstream/json-246.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
253-
// "original/upstream/json-247.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
254-
// "original/upstream/json-248.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
255-
// "original/upstream/json-249.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
256-
// "original/upstream/json-250.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
257-
// "original/upstream/json-251.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
258-
// "original/upstream/json-252.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
259-
// "original/upstream/json-253.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
260-
// "original/upstream/json-254.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
261-
// "original/upstream/json-255.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
262-
// "original/upstream/json-256.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
263-
// "original/upstream/json-257.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
264-
// "original/upstream/json-258.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
265-
// "original/upstream/json-259.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
266-
// "original/upstream/json-260.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
267-
// "original/upstream/json-261.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
268-
// "original/upstream/json-262.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
269-
// "original/upstream/json-263.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
270-
// "original/upstream/json-264.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
271-
// "original/upstream/json-265.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
272-
// "original/upstream/json-266.sql", // REMOVED: 15-16 transformer fails with function name transformation - adds pg_catalog schema qualification
246+
"original/upstream/json-240.sql",
247+
"original/upstream/json-241.sql",
248+
"original/upstream/json-242.sql",
249+
"original/upstream/json-243.sql",
250+
"original/upstream/json-244.sql",
251+
"original/upstream/json-245.sql",
252+
"original/upstream/json-246.sql",
253+
"original/upstream/json-247.sql",
254+
"original/upstream/json-248.sql",
255+
"original/upstream/json-249.sql",
256+
"original/upstream/json-250.sql",
257+
"original/upstream/json-251.sql",
258+
"original/upstream/json-252.sql",
259+
"original/upstream/json-253.sql",
260+
"original/upstream/json-254.sql",
261+
"original/upstream/json-255.sql",
262+
"original/upstream/json-256.sql",
263+
"original/upstream/json-257.sql",
264+
"original/upstream/json-258.sql",
265+
"original/upstream/json-259.sql",
266+
"original/upstream/json-260.sql",
267+
"original/upstream/json-261.sql",
268+
"original/upstream/json-262.sql",
269+
"original/upstream/json-263.sql",
270+
"original/upstream/json-264.sql",
271+
"original/upstream/json-265.sql",
272+
"original/upstream/json-266.sql",
273273
]);
274274
});

packages/transform/src/transformers/v15-to-v16.ts

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -415,9 +415,19 @@ export class V15ToV16Transformer {
415415
const result: any = {};
416416

417417
if (node.funcname !== undefined) {
418-
result.funcname = Array.isArray(node.funcname)
419-
? node.funcname.map((item: any) => this.transform(item as any, context))
420-
: this.transform(node.funcname as any, context);
418+
419+
if (node.funcname.length === 1 && (node.funcname[0] as any)?.String?.sval === 'json_object') {
420+
result.funcname = [
421+
{
422+
String: { sval: 'pg_catalog' }
423+
},
424+
{ String: { sval: 'json_object' } }
425+
];
426+
} else {
427+
result.funcname = Array.isArray(node.funcname)
428+
? node.funcname.map((item: any) => this.transform(item as any, context))
429+
: this.transform(node.funcname as any, context);
430+
}
421431
}
422432

423433
if (node.args !== undefined) {

0 commit comments

Comments
 (0)