fix: resolve 7 plpgsql_schema_rename fixture failures

Two root causes fixed:

1. cleanPlpgsqlTree query normalization bug: The transform function
   applied normalizeQueryWhitespace to ALL keys named 'query', but
   PLpgSQL_stmt_return_query.query is an object (wrapping PLpgSQL_expr),
   not a string. normalizeQueryWhitespace returned non-strings unchanged
   WITHOUT recursing, so the inner PLpgSQL_expr.query string was never
   normalized. Fixed by making the query handler recurse into objects.

2. GET DIAGNOSTICS kind mapping: The parser returns diag_item.kind as a
   string (e.g. 'ROW_COUNT') but getDiagItemKindName() only handled
   numeric enum values. Added string-based mapping so both forms work.

Also removed KNOWN_FAILING_FIXTURES allowlist — all 225 fixtures now
pass round-trip testing.

Author: pyramation

packages/plpgsql-deparser/__tests__/plpgsql-deparser.test.ts

@@ -40,14 +40,7 @@ describe('PLpgSQLDeparser', () => {
     // - Labeled blocks with EXIT statements
     // - Nested DECLARE inside FOR loops (lineno-based scope tracking)
     const KNOWN_FAILING_FIXTURES = new Set<string>([
-      // Pre-existing schema rename deparser issues (whitespace in query expressions)
-      'plpgsql_schema_rename-4.sql',
-      'plpgsql_schema_rename-5.sql',
-      'plpgsql_schema_rename-7.sql',
-      'plpgsql_schema_rename-9.sql',
-      'plpgsql_schema_rename-10.sql',
-      'plpgsql_schema_rename-11.sql',
-      'plpgsql_schema_rename-12.sql',
+      // No known failures - all fixtures pass!
     ]);
 
     it('should round-trip ALL generated fixtures (excluding known failures)', async () => {

packages/plpgsql-deparser/src/plpgsql-deparser.ts

@@ -2034,9 +2034,31 @@ export class PLpgSQLDeparser {
   /**
    * Get the diagnostic item kind name
    */
-  private getDiagItemKindName(kind: number | undefined): string {
+  private getDiagItemKindName(kind: number | string | undefined): string {
     if (kind === undefined) return '';
 
+    // The parser may return kind as a string name (e.g. "ROW_COUNT") or as a
+    // numeric enum value.  Handle both forms so the deparser works regardless.
+    if (typeof kind === 'string') {
+      // Map string names to their SQL keyword equivalents
+      const stringMap: Record<string, string> = {
+        'ROW_COUNT': 'ROW_COUNT',
+        'PG_CONTEXT': 'PG_CONTEXT',
+        'PG_EXCEPTION_CONTEXT': 'PG_EXCEPTION_CONTEXT',
+        'PG_EXCEPTION_DETAIL': 'PG_EXCEPTION_DETAIL',
+        'PG_EXCEPTION_HINT': 'PG_EXCEPTION_HINT',
+        'RETURNED_SQLSTATE': 'RETURNED_SQLSTATE',
+        'COLUMN_NAME': 'COLUMN_NAME',
+        'CONSTRAINT_NAME': 'CONSTRAINT_NAME',
+        'PG_DATATYPE_NAME': 'PG_DATATYPE_NAME',
+        'MESSAGE_TEXT': 'MESSAGE_TEXT',
+        'TABLE_NAME': 'TABLE_NAME',
+        'SCHEMA_NAME': 'SCHEMA_NAME',
+      };
+      const mapped = stringMap[kind];
+      return mapped ? this.keyword(mapped) : '';
+    }
+    
     switch (kind) {
       case DiagItemKind.PLPGSQL_GETDIAG_ROW_COUNT:
         return this.keyword('ROW_COUNT');

packages/plpgsql-deparser/test-utils/index.ts

@@ -207,17 +207,31 @@ export const transform = (obj: any, props: any): any => {
   throw new Error("Unable to copy obj! Its type isn't supported.");
 };
 
+// Props object for cleanPlpgsqlTree, defined as a variable so the query handler
+// can reference it for recursive descent when 'query' is an object (e.g.
+// PLpgSQL_stmt_return_query.query wraps a PLpgSQL_expr, while PLpgSQL_expr.query
+// is the actual SQL string).
+const cleanProps: Record<string, any> = {
+  lineno: noop,
+  location: noop,
+  stmt_len: noop,
+  stmt_location: noop,
+  // varno values are assigned based on position in datums array and can change
+  // when implicit variables (like sqlstate/sqlerrm) are filtered out during deparse
+  varno: noop,
+  query: (val: any): any => {
+    if (typeof val === 'string') {
+      return normalizeQueryWhitespace(val);
+    }
+    // Not a string (e.g. PLpgSQL_stmt_return_query.query is an object wrapping
+    // PLpgSQL_expr) — continue recursing so the inner PLpgSQL_expr.query string
+    // gets normalized.
+    return transform(val, cleanProps);
+  },
+};
+
 export const cleanPlpgsqlTree = (tree: any) => {
-  return transform(tree, {
-    lineno: noop,
-    location: noop,
-    stmt_len: noop,
-    stmt_location: noop,
-    // varno values are assigned based on position in datums array and can change
-    // when implicit variables (like sqlstate/sqlerrm) are filtered out during deparse
-    varno: noop,
-    query: normalizeQueryWhitespace,
-  });
+  return transform(tree, cleanProps);
 };
 
 type ParseErrorType =