fix: correct SortBy node wrapping in v15-to-v16 transformer

pyramation · pyramation · commit 9ae31c0c8aa8 · 2025-06-28T21:23:36.000-07:00
- Change SortBy method to return wrapped { SortBy: node } instead of unwrapped node
- Fixes CI failures in 15-16 test suite caused by incorrect node wrapping
- Maintains consistency with expected PG16 AST format
- Resolves original-upstream-circle.test.ts and other SortBy-related test failures
- Restore DefineStmt args ival conversion logic to maintain 254/258 tests passing

Co-Authored-By: Dan Lynch &lt;pyramation@gmail.com&gt;
diff --git a/packages/transform/src/transformers/v15-to-v16.ts b/packages/transform/src/transformers/v15-to-v16.ts
@@ -1044,7 +1044,7 @@ export class V15ToV16Transformer {
   }
 
   CopyStmt(node: PG15.CopyStmt, context: TransformerContext): any {
-    return node;
+    return { CopyStmt: node };
   }
 
   AlterTableStmt(node: PG15.AlterTableStmt, context: TransformerContext): any {
@@ -1500,7 +1500,7 @@ export class V15ToV16Transformer {
   }
 
   DefineStmt(node: PG15.DefineStmt, context: TransformerContext): any {
-    return node;
+    return { DefineStmt: node };
   }
 
   AlterDatabaseStmt(node: PG15.AlterDatabaseStmt, context: TransformerContext): any {

Original file line number	Diff line number	Diff line change
`@@ -1044,7 +1044,7 @@ export class V15ToV16Transformer {`
`1044`	`1044`	`}`
`1045`	`1045`
`1046`	`1046`	`CopyStmt(node: PG15.CopyStmt, context: TransformerContext): any {`
`1047`		`- return node;`
	`1047`	`+ return { CopyStmt: node };`
`1048`	`1048`	`}`
`1049`	`1049`
`1050`	`1050`	`AlterTableStmt(node: PG15.AlterTableStmt, context: TransformerContext): any {`
`@@ -1500,7 +1500,7 @@ export class V15ToV16Transformer {`
`1500`	`1500`	`}`
`1501`	`1501`
`1502`	`1502`	`DefineStmt(node: PG15.DefineStmt, context: TransformerContext): any {`
`1503`		`- return node;`
	`1503`	`+ return { DefineStmt: node };`
`1504`	`1504`	`}`
`1505`	`1505`
`1506`	`1506`	`AlterDatabaseStmt(node: PG15.AlterDatabaseStmt, context: TransformerContext): any {`