@pgsql/utils 17.5.2 → 17.6.1

package/asts.js

@@ -4,115 +4,65 @@ var __importDefault = (this && this.__importDefault) || function (mod) {
 };
 Object.defineProperty(exports, "__esModule", { value: true });
 /**
-* This file was automatically generated by pg-proto-parser@1.28.2.
+* This file was automatically generated by pg-proto-parser@1.29.0.
 * DO NOT MODIFY IT BY HAND. Instead, modify the source proto file,
 * and run the pg-proto-parser generate command to regenerate this file.
 */
 const nested_obj_1 = __importDefault(require("nested-obj"));
 exports.default = {
-    parseResult(_p, isNode) {
+    parseResult(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "version", _p?.version);
         nested_obj_1.default.set(_j, "stmts", _p?.stmts);
-        if (isNode) {
-            return {
-                ParseResult: _j
-            };
-        }
         return _j;
     },
-    scanResult(_p, isNode) {
+    scanResult(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "version", _p?.version);
         nested_obj_1.default.set(_j, "tokens", _p?.tokens);
-        if (isNode) {
-            return {
-                ScanResult: _j
-            };
-        }
         return _j;
     },
-    integer(_p, isNode) {
+    integer(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "ival", _p?.ival);
-        if (isNode) {
-            return {
-                Integer: _j
-            };
-        }
         return _j;
     },
-    float(_p, isNode) {
+    float(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "fval", _p?.fval);
-        if (isNode) {
-            return {
-                Float: _j
-            };
-        }
         return _j;
     },
-    boolean(_p, isNode) {
+    boolean(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "boolval", _p?.boolval);
-        if (isNode) {
-            return {
-                Boolean: _j
-            };
-        }
         return _j;
     },
-    string(_p, isNode) {
+    string(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "sval", _p?.sval);
-        if (isNode) {
-            return {
-                String: _j
-            };
-        }
         return _j;
     },
-    bitString(_p, isNode) {
+    bitString(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "bsval", _p?.bsval);
-        if (isNode) {
-            return {
-                BitString: _j
-            };
-        }
         return _j;
     },
-    list(_p, isNode) {
+    list(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "items", _p?.items);
-        if (isNode) {
-            return {
-                List: _j
-            };
-        }
         return _j;
     },
-    oidList(_p, isNode) {
+    oidList(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "items", _p?.items);
-        if (isNode) {
-            return {
-                OidList: _j
-            };
-        }
         return _j;
     },
-    intList(_p, isNode) {
+    intList(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "items", _p?.items);
-        if (isNode) {
-            return {
-                IntList: _j
-            };
-        }
         return _j;
     },
-    aConst(_p, isNode) {
+    aConst(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "ival", _p?.ival);
         nested_obj_1.default.set(_j, "fval", _p?.fval);
@@ -121,25 +71,15 @@ exports.default = {
         nested_obj_1.default.set(_j, "bsval", _p?.bsval);
         nested_obj_1.default.set(_j, "isnull", _p?.isnull);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                A_Const: _j
-            };
-        }
         return _j;
     },
-    alias(_p, isNode) {
+    alias(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "aliasname", _p?.aliasname);
         nested_obj_1.default.set(_j, "colnames", _p?.colnames);
-        if (isNode) {
-            return {
-                Alias: _j
-            };
-        }
         return _j;
     },
-    rangeVar(_p, isNode) {
+    rangeVar(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "catalogname", _p?.catalogname);
         nested_obj_1.default.set(_j, "schemaname", _p?.schemaname);
@@ -148,14 +88,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "relpersistence", _p?.relpersistence);
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RangeVar: _j
-            };
-        }
         return _j;
     },
-    tableFunc(_p, isNode) {
+    tableFunc(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "functype", _p?.functype);
         nested_obj_1.default.set(_j, "ns_uris", _p?.ns_uris);
@@ -174,14 +109,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "plan", _p?.plan);
         nested_obj_1.default.set(_j, "ordinalitycol", _p?.ordinalitycol);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                TableFunc: _j
-            };
-        }
         return _j;
     },
-    intoClause(_p, isNode) {
+    intoClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "rel", _p?.rel);
         nested_obj_1.default.set(_j, "colNames", _p?.colNames);
@@ -191,14 +121,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "tableSpaceName", _p?.tableSpaceName);
         nested_obj_1.default.set(_j, "viewQuery", _p?.viewQuery);
         nested_obj_1.default.set(_j, "skipData", _p?.skipData);
-        if (isNode) {
-            return {
-                IntoClause: _j
-            };
-        }
         return _j;
     },
-    var(_p, isNode) {
+    var(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "varno", _p?.varno);
@@ -209,14 +134,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "varnullingrels", _p?.varnullingrels);
         nested_obj_1.default.set(_j, "varlevelsup", _p?.varlevelsup);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                Var: _j
-            };
-        }
         return _j;
     },
-    param(_p, isNode) {
+    param(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "paramkind", _p?.paramkind);
@@ -225,14 +145,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "paramtypmod", _p?.paramtypmod);
         nested_obj_1.default.set(_j, "paramcollid", _p?.paramcollid);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                Param: _j
-            };
-        }
         return _j;
     },
-    aggref(_p, isNode) {
+    aggref(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "aggfnoid", _p?.aggfnoid);
@@ -253,28 +168,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "aggno", _p?.aggno);
         nested_obj_1.default.set(_j, "aggtransno", _p?.aggtransno);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                Aggref: _j
-            };
-        }
         return _j;
     },
-    groupingFunc(_p, isNode) {
+    groupingFunc(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "refs", _p?.refs);
         nested_obj_1.default.set(_j, "agglevelsup", _p?.agglevelsup);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                GroupingFunc: _j
-            };
-        }
         return _j;
     },
-    windowFunc(_p, isNode) {
+    windowFunc(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "winfnoid", _p?.winfnoid);
@@ -288,41 +193,26 @@ exports.default = {
         nested_obj_1.default.set(_j, "winstar", _p?.winstar);
         nested_obj_1.default.set(_j, "winagg", _p?.winagg);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                WindowFunc: _j
-            };
-        }
         return _j;
     },
-    windowFuncRunCondition(_p, isNode) {
+    windowFuncRunCondition(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "opno", _p?.opno);
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "wfunc_left", _p?.wfunc_left);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
-        if (isNode) {
-            return {
-                WindowFuncRunCondition: _j
-            };
-        }
         return _j;
     },
-    mergeSupportFunc(_p, isNode) {
+    mergeSupportFunc(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "msftype", _p?.msftype);
         nested_obj_1.default.set(_j, "msfcollid", _p?.msfcollid);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                MergeSupportFunc: _j
-            };
-        }
         return _j;
     },
-    subscriptingRef(_p, isNode) {
+    subscriptingRef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "refcontainertype", _p?.refcontainertype);
@@ -334,14 +224,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "reflowerindexpr", _p?.reflowerindexpr);
         nested_obj_1.default.set(_j, "refexpr", _p?.refexpr);
         nested_obj_1.default.set(_j, "refassgnexpr", _p?.refassgnexpr);
-        if (isNode) {
-            return {
-                SubscriptingRef: _j
-            };
-        }
         return _j;
     },
-    funcExpr(_p, isNode) {
+    funcExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "funcid", _p?.funcid);
@@ -353,28 +238,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                FuncExpr: _j
-            };
-        }
         return _j;
     },
-    namedArgExpr(_p, isNode) {
+    namedArgExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "argnumber", _p?.argnumber);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                NamedArgExpr: _j
-            };
-        }
         return _j;
     },
-    opExpr(_p, isNode) {
+    opExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "opno", _p?.opno);
@@ -384,14 +259,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                OpExpr: _j
-            };
-        }
         return _j;
     },
-    distinctExpr(_p, isNode) {
+    distinctExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "opno", _p?.opno);
@@ -401,14 +271,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                DistinctExpr: _j
-            };
-        }
         return _j;
     },
-    nullIfExpr(_p, isNode) {
+    nullIfExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "opno", _p?.opno);
@@ -418,14 +283,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                NullIfExpr: _j
-            };
-        }
         return _j;
     },
-    scalarArrayOpExpr(_p, isNode) {
+    scalarArrayOpExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "opno", _p?.opno);
@@ -433,27 +293,17 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollid", _p?.inputcollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ScalarArrayOpExpr: _j
-            };
-        }
         return _j;
     },
-    boolExpr(_p, isNode) {
+    boolExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "boolop", _p?.boolop);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                BoolExpr: _j
-            };
-        }
         return _j;
     },
-    subLink(_p, isNode) {
+    subLink(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "subLinkType", _p?.subLinkType);
@@ -462,14 +312,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "operName", _p?.operName);
         nested_obj_1.default.set(_j, "subselect", _p?.subselect);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                SubLink: _j
-            };
-        }
         return _j;
     },
-    subPlan(_p, isNode) {
+    subPlan(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "subLinkType", _p?.subLinkType);
@@ -488,25 +333,15 @@ exports.default = {
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "startup_cost", _p?.startup_cost);
         nested_obj_1.default.set(_j, "per_call_cost", _p?.per_call_cost);
-        if (isNode) {
-            return {
-                SubPlan: _j
-            };
-        }
         return _j;
     },
-    alternativeSubPlan(_p, isNode) {
+    alternativeSubPlan(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "subplans", _p?.subplans);
-        if (isNode) {
-            return {
-                AlternativeSubPlan: _j
-            };
-        }
         return _j;
     },
-    fieldSelect(_p, isNode) {
+    fieldSelect(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
@@ -514,28 +349,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "resulttype", _p?.resulttype);
         nested_obj_1.default.set(_j, "resulttypmod", _p?.resulttypmod);
         nested_obj_1.default.set(_j, "resultcollid", _p?.resultcollid);
-        if (isNode) {
-            return {
-                FieldSelect: _j
-            };
-        }
         return _j;
     },
-    fieldStore(_p, isNode) {
+    fieldStore(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "newvals", _p?.newvals);
         nested_obj_1.default.set(_j, "fieldnums", _p?.fieldnums);
         nested_obj_1.default.set(_j, "resulttype", _p?.resulttype);
-        if (isNode) {
-            return {
-                FieldStore: _j
-            };
-        }
         return _j;
     },
-    relabelType(_p, isNode) {
+    relabelType(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
@@ -544,14 +369,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "resultcollid", _p?.resultcollid);
         nested_obj_1.default.set(_j, "relabelformat", _p?.relabelformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RelabelType: _j
-            };
-        }
         return _j;
     },
-    coerceViaio(_p, isNode) {
+    coerceViaio(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
@@ -559,14 +379,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "resultcollid", _p?.resultcollid);
         nested_obj_1.default.set(_j, "coerceformat", _p?.coerceformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CoerceViaIO: _j
-            };
-        }
         return _j;
     },
-    arrayCoerceExpr(_p, isNode) {
+    arrayCoerceExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
@@ -576,41 +391,26 @@ exports.default = {
         nested_obj_1.default.set(_j, "resultcollid", _p?.resultcollid);
         nested_obj_1.default.set(_j, "coerceformat", _p?.coerceformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ArrayCoerceExpr: _j
-            };
-        }
         return _j;
     },
-    convertRowtypeExpr(_p, isNode) {
+    convertRowtypeExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "resulttype", _p?.resulttype);
         nested_obj_1.default.set(_j, "convertformat", _p?.convertformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ConvertRowtypeExpr: _j
-            };
-        }
         return _j;
     },
-    collateExpr(_p, isNode) {
+    collateExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "collOid", _p?.collOid);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CollateExpr: _j
-            };
-        }
         return _j;
     },
-    caseExpr(_p, isNode) {
+    caseExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "casetype", _p?.casetype);
@@ -619,40 +419,25 @@ exports.default = {
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "defresult", _p?.defresult);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CaseExpr: _j
-            };
-        }
         return _j;
     },
-    caseWhen(_p, isNode) {
+    caseWhen(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "result", _p?.result);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CaseWhen: _j
-            };
-        }
         return _j;
     },
-    caseTestExpr(_p, isNode) {
+    caseTestExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "typeId", _p?.typeId);
         nested_obj_1.default.set(_j, "typeMod", _p?.typeMod);
         nested_obj_1.default.set(_j, "collation", _p?.collation);
-        if (isNode) {
-            return {
-                CaseTestExpr: _j
-            };
-        }
         return _j;
     },
-    arrayExpr(_p, isNode) {
+    arrayExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "array_typeid", _p?.array_typeid);
@@ -661,14 +446,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "elements", _p?.elements);
         nested_obj_1.default.set(_j, "multidims", _p?.multidims);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ArrayExpr: _j
-            };
-        }
         return _j;
     },
-    rowExpr(_p, isNode) {
+    rowExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "args", _p?.args);
@@ -676,14 +456,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "row_format", _p?.row_format);
         nested_obj_1.default.set(_j, "colnames", _p?.colnames);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RowExpr: _j
-            };
-        }
         return _j;
     },
-    rowCompareExpr(_p, isNode) {
+    rowCompareExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "rctype", _p?.rctype);
@@ -692,28 +467,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "inputcollids", _p?.inputcollids);
         nested_obj_1.default.set(_j, "largs", _p?.largs);
         nested_obj_1.default.set(_j, "rargs", _p?.rargs);
-        if (isNode) {
-            return {
-                RowCompareExpr: _j
-            };
-        }
         return _j;
     },
-    coalesceExpr(_p, isNode) {
+    coalesceExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "coalescetype", _p?.coalescetype);
         nested_obj_1.default.set(_j, "coalescecollid", _p?.coalescecollid);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CoalesceExpr: _j
-            };
-        }
         return _j;
     },
-    minMaxExpr(_p, isNode) {
+    minMaxExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "minmaxtype", _p?.minmaxtype);
@@ -722,28 +487,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "op", _p?.op);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                MinMaxExpr: _j
-            };
-        }
         return _j;
     },
-    sqlValueFunction(_p, isNode) {
+    sqlValueFunction(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "op", _p?.op);
         nested_obj_1.default.set(_j, "type", _p?.type);
         nested_obj_1.default.set(_j, "typmod", _p?.typmod);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                SQLValueFunction: _j
-            };
-        }
         return _j;
     },
-    xmlExpr(_p, isNode) {
+    xmlExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "op", _p?.op);
@@ -756,50 +511,30 @@ exports.default = {
         nested_obj_1.default.set(_j, "type", _p?.type);
         nested_obj_1.default.set(_j, "typmod", _p?.typmod);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                XmlExpr: _j
-            };
-        }
         return _j;
     },
-    jsonFormat(_p, isNode) {
+    jsonFormat(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "format_type", _p?.format_type);
         nested_obj_1.default.set(_j, "encoding", _p?.encoding);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonFormat: _j
-            };
-        }
         return _j;
     },
-    jsonReturning(_p, isNode) {
+    jsonReturning(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "format", _p?.format);
         nested_obj_1.default.set(_j, "typid", _p?.typid);
         nested_obj_1.default.set(_j, "typmod", _p?.typmod);
-        if (isNode) {
-            return {
-                JsonReturning: _j
-            };
-        }
         return _j;
     },
-    jsonValueExpr(_p, isNode) {
+    jsonValueExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "raw_expr", _p?.raw_expr);
         nested_obj_1.default.set(_j, "formatted_expr", _p?.formatted_expr);
         nested_obj_1.default.set(_j, "format", _p?.format);
-        if (isNode) {
-            return {
-                JsonValueExpr: _j
-            };
-        }
         return _j;
     },
-    jsonConstructorExpr(_p, isNode) {
+    jsonConstructorExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "type", _p?.type);
@@ -810,41 +545,26 @@ exports.default = {
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
         nested_obj_1.default.set(_j, "unique", _p?.unique);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonConstructorExpr: _j
-            };
-        }
         return _j;
     },
-    jsonIsPredicate(_p, isNode) {
+    jsonIsPredicate(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "format", _p?.format);
         nested_obj_1.default.set(_j, "item_type", _p?.item_type);
         nested_obj_1.default.set(_j, "unique_keys", _p?.unique_keys);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonIsPredicate: _j
-            };
-        }
         return _j;
     },
-    jsonBehavior(_p, isNode) {
+    jsonBehavior(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "btype", _p?.btype);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "coerce", _p?.coerce);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonBehavior: _j
-            };
-        }
         return _j;
     },
-    jsonExpr(_p, isNode) {
+    jsonExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "op", _p?.op);
@@ -863,24 +583,14 @@ exports.default = {
         nested_obj_1.default.set(_j, "omit_quotes", _p?.omit_quotes);
         nested_obj_1.default.set(_j, "collation", _p?.collation);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonExpr: _j
-            };
-        }
         return _j;
     },
-    jsonTablePath(_p, isNode) {
+    jsonTablePath(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
-        if (isNode) {
-            return {
-                JsonTablePath: _j
-            };
-        }
         return _j;
     },
-    jsonTablePathScan(_p, isNode) {
+    jsonTablePathScan(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "plan", _p?.plan);
         nested_obj_1.default.set(_j, "path", _p?.path);
@@ -888,53 +598,33 @@ exports.default = {
         nested_obj_1.default.set(_j, "child", _p?.child);
         nested_obj_1.default.set(_j, "colMin", _p?.colMin);
         nested_obj_1.default.set(_j, "colMax", _p?.colMax);
-        if (isNode) {
-            return {
-                JsonTablePathScan: _j
-            };
-        }
         return _j;
     },
-    jsonTableSiblingJoin(_p, isNode) {
+    jsonTableSiblingJoin(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "plan", _p?.plan);
         nested_obj_1.default.set(_j, "lplan", _p?.lplan);
         nested_obj_1.default.set(_j, "rplan", _p?.rplan);
-        if (isNode) {
-            return {
-                JsonTableSiblingJoin: _j
-            };
-        }
         return _j;
     },
-    nullTest(_p, isNode) {
+    nullTest(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "nulltesttype", _p?.nulltesttype);
         nested_obj_1.default.set(_j, "argisrow", _p?.argisrow);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                NullTest: _j
-            };
-        }
         return _j;
     },
-    booleanTest(_p, isNode) {
+    booleanTest(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "booltesttype", _p?.booltesttype);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                BooleanTest: _j
-            };
-        }
         return _j;
     },
-    mergeAction(_p, isNode) {
+    mergeAction(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "matchKind", _p?.matchKind);
         nested_obj_1.default.set(_j, "commandType", _p?.commandType);
@@ -942,14 +632,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "qual", _p?.qual);
         nested_obj_1.default.set(_j, "targetList", _p?.targetList);
         nested_obj_1.default.set(_j, "updateColnos", _p?.updateColnos);
-        if (isNode) {
-            return {
-                MergeAction: _j
-            };
-        }
         return _j;
     },
-    coerceToDomain(_p, isNode) {
+    coerceToDomain(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
@@ -958,80 +643,50 @@ exports.default = {
         nested_obj_1.default.set(_j, "resultcollid", _p?.resultcollid);
         nested_obj_1.default.set(_j, "coercionformat", _p?.coercionformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CoerceToDomain: _j
-            };
-        }
         return _j;
     },
-    coerceToDomainValue(_p, isNode) {
+    coerceToDomainValue(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "typeId", _p?.typeId);
         nested_obj_1.default.set(_j, "typeMod", _p?.typeMod);
         nested_obj_1.default.set(_j, "collation", _p?.collation);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CoerceToDomainValue: _j
-            };
-        }
         return _j;
     },
-    setToDefault(_p, isNode) {
+    setToDefault(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "typeId", _p?.typeId);
         nested_obj_1.default.set(_j, "typeMod", _p?.typeMod);
         nested_obj_1.default.set(_j, "collation", _p?.collation);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                SetToDefault: _j
-            };
-        }
         return _j;
     },
-    currentOfExpr(_p, isNode) {
+    currentOfExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "cvarno", _p?.cvarno);
         nested_obj_1.default.set(_j, "cursor_name", _p?.cursor_name);
         nested_obj_1.default.set(_j, "cursor_param", _p?.cursor_param);
-        if (isNode) {
-            return {
-                CurrentOfExpr: _j
-            };
-        }
         return _j;
     },
-    nextValueExpr(_p, isNode) {
+    nextValueExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "seqid", _p?.seqid);
         nested_obj_1.default.set(_j, "typeId", _p?.typeId);
-        if (isNode) {
-            return {
-                NextValueExpr: _j
-            };
-        }
         return _j;
     },
-    inferenceElem(_p, isNode) {
+    inferenceElem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "infercollid", _p?.infercollid);
         nested_obj_1.default.set(_j, "inferopclass", _p?.inferopclass);
-        if (isNode) {
-            return {
-                InferenceElem: _j
-            };
-        }
         return _j;
     },
-    targetEntry(_p, isNode) {
+    targetEntry(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xpr", _p?.xpr);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
@@ -1041,24 +696,14 @@ exports.default = {
         nested_obj_1.default.set(_j, "resorigtbl", _p?.resorigtbl);
         nested_obj_1.default.set(_j, "resorigcol", _p?.resorigcol);
         nested_obj_1.default.set(_j, "resjunk", _p?.resjunk);
-        if (isNode) {
-            return {
-                TargetEntry: _j
-            };
-        }
         return _j;
     },
-    rangeTblRef(_p, isNode) {
+    rangeTblRef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "rtindex", _p?.rtindex);
-        if (isNode) {
-            return {
-                RangeTblRef: _j
-            };
-        }
         return _j;
     },
-    joinExpr(_p, isNode) {
+    joinExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "jointype", _p?.jointype);
         nested_obj_1.default.set(_j, "isNatural", _p?.isNatural);
@@ -1069,25 +714,15 @@ exports.default = {
         nested_obj_1.default.set(_j, "quals", _p?.quals);
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "rtindex", _p?.rtindex);
-        if (isNode) {
-            return {
-                JoinExpr: _j
-            };
-        }
         return _j;
     },
-    fromExpr(_p, isNode) {
+    fromExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "fromlist", _p?.fromlist);
         nested_obj_1.default.set(_j, "quals", _p?.quals);
-        if (isNode) {
-            return {
-                FromExpr: _j
-            };
-        }
         return _j;
     },
-    onConflictExpr(_p, isNode) {
+    onConflictExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "action", _p?.action);
         nested_obj_1.default.set(_j, "arbiterElems", _p?.arbiterElems);
@@ -1097,14 +732,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "onConflictWhere", _p?.onConflictWhere);
         nested_obj_1.default.set(_j, "exclRelIndex", _p?.exclRelIndex);
         nested_obj_1.default.set(_j, "exclRelTlist", _p?.exclRelTlist);
-        if (isNode) {
-            return {
-                OnConflictExpr: _j
-            };
-        }
         return _j;
     },
-    query(_p, isNode) {
+    query(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "commandType", _p?.commandType);
         nested_obj_1.default.set(_j, "querySource", _p?.querySource);
@@ -1148,14 +778,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "withCheckOptions", _p?.withCheckOptions);
         nested_obj_1.default.set(_j, "stmt_location", _p?.stmt_location);
         nested_obj_1.default.set(_j, "stmt_len", _p?.stmt_len);
-        if (isNode) {
-            return {
-                Query: _j
-            };
-        }
         return _j;
     },
-    typeName(_p, isNode) {
+    typeName(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "names", _p?.names);
         nested_obj_1.default.set(_j, "typeOid", _p?.typeOid);
@@ -1165,86 +790,51 @@ exports.default = {
         nested_obj_1.default.set(_j, "typemod", _p?.typemod);
         nested_obj_1.default.set(_j, "arrayBounds", _p?.arrayBounds);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                TypeName: _j
-            };
-        }
         return _j;
     },
-    columnRef(_p, isNode) {
+    columnRef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "fields", _p?.fields);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ColumnRef: _j
-            };
-        }
         return _j;
     },
-    paramRef(_p, isNode) {
+    paramRef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "number", _p?.number);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ParamRef: _j
-            };
-        }
         return _j;
     },
-    aExpr(_p, isNode) {
+    aExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "lexpr", _p?.lexpr);
         nested_obj_1.default.set(_j, "rexpr", _p?.rexpr);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                A_Expr: _j
-            };
-        }
         return _j;
     },
-    typeCast(_p, isNode) {
+    typeCast(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                TypeCast: _j
-            };
-        }
         return _j;
     },
-    collateClause(_p, isNode) {
+    collateClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "collname", _p?.collname);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CollateClause: _j
-            };
-        }
         return _j;
     },
-    roleSpec(_p, isNode) {
+    roleSpec(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "roletype", _p?.roletype);
         nested_obj_1.default.set(_j, "rolename", _p?.rolename);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RoleSpec: _j
-            };
-        }
         return _j;
     },
-    funcCall(_p, isNode) {
+    funcCall(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "funcname", _p?.funcname);
         nested_obj_1.default.set(_j, "args", _p?.args);
@@ -1257,96 +847,56 @@ exports.default = {
         nested_obj_1.default.set(_j, "func_variadic", _p?.func_variadic);
         nested_obj_1.default.set(_j, "funcformat", _p?.funcformat);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                FuncCall: _j
-            };
-        }
         return _j;
     },
-    aStar(_p, isNode) {
+    aStar(_p) {
         const _j = {};
-        if (isNode) {
-            return {
-                A_Star: _j
-            };
-        }
         return _j;
     },
-    aIndices(_p, isNode) {
+    aIndices(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "is_slice", _p?.is_slice);
         nested_obj_1.default.set(_j, "lidx", _p?.lidx);
         nested_obj_1.default.set(_j, "uidx", _p?.uidx);
-        if (isNode) {
-            return {
-                A_Indices: _j
-            };
-        }
         return _j;
     },
-    aIndirection(_p, isNode) {
+    aIndirection(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "indirection", _p?.indirection);
-        if (isNode) {
-            return {
-                A_Indirection: _j
-            };
-        }
         return _j;
     },
-    aArrayExpr(_p, isNode) {
+    aArrayExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "elements", _p?.elements);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                A_ArrayExpr: _j
-            };
-        }
         return _j;
     },
-    resTarget(_p, isNode) {
+    resTarget(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "indirection", _p?.indirection);
         nested_obj_1.default.set(_j, "val", _p?.val);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ResTarget: _j
-            };
-        }
         return _j;
     },
-    multiAssignRef(_p, isNode) {
+    multiAssignRef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "source", _p?.source);
         nested_obj_1.default.set(_j, "colno", _p?.colno);
         nested_obj_1.default.set(_j, "ncolumns", _p?.ncolumns);
-        if (isNode) {
-            return {
-                MultiAssignRef: _j
-            };
-        }
         return _j;
     },
-    sortBy(_p, isNode) {
+    sortBy(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "node", _p?.node);
         nested_obj_1.default.set(_j, "sortby_dir", _p?.sortby_dir);
         nested_obj_1.default.set(_j, "sortby_nulls", _p?.sortby_nulls);
         nested_obj_1.default.set(_j, "useOp", _p?.useOp);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                SortBy: _j
-            };
-        }
         return _j;
     },
-    windowDef(_p, isNode) {
+    windowDef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "refname", _p?.refname);
@@ -1356,26 +906,16 @@ exports.default = {
         nested_obj_1.default.set(_j, "startOffset", _p?.startOffset);
         nested_obj_1.default.set(_j, "endOffset", _p?.endOffset);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                WindowDef: _j
-            };
-        }
         return _j;
     },
-    rangeSubselect(_p, isNode) {
+    rangeSubselect(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "lateral", _p?.lateral);
         nested_obj_1.default.set(_j, "subquery", _p?.subquery);
         nested_obj_1.default.set(_j, "alias", _p?.alias);
-        if (isNode) {
-            return {
-                RangeSubselect: _j
-            };
-        }
         return _j;
     },
-    rangeFunction(_p, isNode) {
+    rangeFunction(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "lateral", _p?.lateral);
         nested_obj_1.default.set(_j, "ordinality", _p?.ordinality);
@@ -1383,14 +923,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "functions", _p?.functions);
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "coldeflist", _p?.coldeflist);
-        if (isNode) {
-            return {
-                RangeFunction: _j
-            };
-        }
         return _j;
     },
-    rangeTableFunc(_p, isNode) {
+    rangeTableFunc(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "lateral", _p?.lateral);
         nested_obj_1.default.set(_j, "docexpr", _p?.docexpr);
@@ -1399,14 +934,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "columns", _p?.columns);
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RangeTableFunc: _j
-            };
-        }
         return _j;
     },
-    rangeTableFuncCol(_p, isNode) {
+    rangeTableFuncCol(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "colname", _p?.colname);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
@@ -1415,28 +945,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "colexpr", _p?.colexpr);
         nested_obj_1.default.set(_j, "coldefexpr", _p?.coldefexpr);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RangeTableFuncCol: _j
-            };
-        }
         return _j;
     },
-    rangeTableSample(_p, isNode) {
+    rangeTableSample(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "method", _p?.method);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "repeatable", _p?.repeatable);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                RangeTableSample: _j
-            };
-        }
         return _j;
     },
-    columnDef(_p, isNode) {
+    columnDef(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "colname", _p?.colname);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
@@ -1457,26 +977,16 @@ exports.default = {
         nested_obj_1.default.set(_j, "constraints", _p?.constraints);
         nested_obj_1.default.set(_j, "fdwoptions", _p?.fdwoptions);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                ColumnDef: _j
-            };
-        }
         return _j;
     },
-    tableLikeClause(_p, isNode) {
+    tableLikeClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "relationOid", _p?.relationOid);
-        if (isNode) {
-            return {
-                TableLikeClause: _j
-            };
-        }
         return _j;
     },
-    indexElem(_p, isNode) {
+    indexElem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
@@ -1486,80 +996,50 @@ exports.default = {
         nested_obj_1.default.set(_j, "opclassopts", _p?.opclassopts);
         nested_obj_1.default.set(_j, "ordering", _p?.ordering);
         nested_obj_1.default.set(_j, "nulls_ordering", _p?.nulls_ordering);
-        if (isNode) {
-            return {
-                IndexElem: _j
-            };
-        }
         return _j;
     },
-    defElem(_p, isNode) {
+    defElem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "defnamespace", _p?.defnamespace);
         nested_obj_1.default.set(_j, "defname", _p?.defname);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "defaction", _p?.defaction);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                DefElem: _j
-            };
-        }
         return _j;
     },
-    lockingClause(_p, isNode) {
+    lockingClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "lockedRels", _p?.lockedRels);
         nested_obj_1.default.set(_j, "strength", _p?.strength);
         nested_obj_1.default.set(_j, "waitPolicy", _p?.waitPolicy);
-        if (isNode) {
-            return {
-                LockingClause: _j
-            };
-        }
         return _j;
     },
-    xmlSerialize(_p, isNode) {
+    xmlSerialize(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "xmloption", _p?.xmloption);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "indent", _p?.indent);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                XmlSerialize: _j
-            };
-        }
         return _j;
     },
-    partitionElem(_p, isNode) {
+    partitionElem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "collation", _p?.collation);
         nested_obj_1.default.set(_j, "opclass", _p?.opclass);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PartitionElem: _j
-            };
-        }
         return _j;
     },
-    partitionSpec(_p, isNode) {
+    partitionSpec(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "strategy", _p?.strategy);
         nested_obj_1.default.set(_j, "partParams", _p?.partParams);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PartitionSpec: _j
-            };
-        }
         return _j;
     },
-    partitionBoundSpec(_p, isNode) {
+    partitionBoundSpec(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "strategy", _p?.strategy);
         nested_obj_1.default.set(_j, "is_default", _p?.is_default);
@@ -1569,47 +1049,27 @@ exports.default = {
         nested_obj_1.default.set(_j, "lowerdatums", _p?.lowerdatums);
         nested_obj_1.default.set(_j, "upperdatums", _p?.upperdatums);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PartitionBoundSpec: _j
-            };
-        }
         return _j;
     },
-    partitionRangeDatum(_p, isNode) {
+    partitionRangeDatum(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "value", _p?.value);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PartitionRangeDatum: _j
-            };
-        }
         return _j;
     },
-    singlePartitionSpec(_p, isNode) {
+    singlePartitionSpec(_p) {
         const _j = {};
-        if (isNode) {
-            return {
-                SinglePartitionSpec: _j
-            };
-        }
         return _j;
     },
-    partitionCmd(_p, isNode) {
+    partitionCmd(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "bound", _p?.bound);
         nested_obj_1.default.set(_j, "concurrent", _p?.concurrent);
-        if (isNode) {
-            return {
-                PartitionCmd: _j
-            };
-        }
         return _j;
     },
-    rangeTblEntry(_p, isNode) {
+    rangeTblEntry(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "eref", _p?.eref);
@@ -1643,14 +1103,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "lateral", _p?.lateral);
         nested_obj_1.default.set(_j, "inFromCl", _p?.inFromCl);
         nested_obj_1.default.set(_j, "securityQuals", _p?.securityQuals);
-        if (isNode) {
-            return {
-                RangeTblEntry: _j
-            };
-        }
         return _j;
     },
-    rtePermissionInfo(_p, isNode) {
+    rtePermissionInfo(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relid", _p?.relid);
         nested_obj_1.default.set(_j, "inh", _p?.inh);
@@ -1659,14 +1114,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "selectedCols", _p?.selectedCols);
         nested_obj_1.default.set(_j, "insertedCols", _p?.insertedCols);
         nested_obj_1.default.set(_j, "updatedCols", _p?.updatedCols);
-        if (isNode) {
-            return {
-                RTEPermissionInfo: _j
-            };
-        }
         return _j;
     },
-    rangeTblFunction(_p, isNode) {
+    rangeTblFunction(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "funcexpr", _p?.funcexpr);
         nested_obj_1.default.set(_j, "funccolcount", _p?.funccolcount);
@@ -1675,66 +1125,41 @@ exports.default = {
         nested_obj_1.default.set(_j, "funccoltypmods", _p?.funccoltypmods);
         nested_obj_1.default.set(_j, "funccolcollations", _p?.funccolcollations);
         nested_obj_1.default.set(_j, "funcparams", _p?.funcparams);
-        if (isNode) {
-            return {
-                RangeTblFunction: _j
-            };
-        }
         return _j;
     },
-    tableSampleClause(_p, isNode) {
+    tableSampleClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "tsmhandler", _p?.tsmhandler);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "repeatable", _p?.repeatable);
-        if (isNode) {
-            return {
-                TableSampleClause: _j
-            };
-        }
         return _j;
     },
-    withCheckOption(_p, isNode) {
+    withCheckOption(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "relname", _p?.relname);
         nested_obj_1.default.set(_j, "polname", _p?.polname);
         nested_obj_1.default.set(_j, "qual", _p?.qual);
         nested_obj_1.default.set(_j, "cascaded", _p?.cascaded);
-        if (isNode) {
-            return {
-                WithCheckOption: _j
-            };
-        }
         return _j;
     },
-    sortGroupClause(_p, isNode) {
+    sortGroupClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "tleSortGroupRef", _p?.tleSortGroupRef);
         nested_obj_1.default.set(_j, "eqop", _p?.eqop);
         nested_obj_1.default.set(_j, "sortop", _p?.sortop);
         nested_obj_1.default.set(_j, "nulls_first", _p?.nulls_first);
         nested_obj_1.default.set(_j, "hashable", _p?.hashable);
-        if (isNode) {
-            return {
-                SortGroupClause: _j
-            };
-        }
         return _j;
     },
-    groupingSet(_p, isNode) {
+    groupingSet(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "content", _p?.content);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                GroupingSet: _j
-            };
-        }
         return _j;
     },
-    windowClause(_p, isNode) {
+    windowClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "refname", _p?.refname);
@@ -1750,79 +1175,49 @@ exports.default = {
         nested_obj_1.default.set(_j, "inRangeNullsFirst", _p?.inRangeNullsFirst);
         nested_obj_1.default.set(_j, "winref", _p?.winref);
         nested_obj_1.default.set(_j, "copiedOrder", _p?.copiedOrder);
-        if (isNode) {
-            return {
-                WindowClause: _j
-            };
-        }
         return _j;
     },
-    rowMarkClause(_p, isNode) {
+    rowMarkClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "rti", _p?.rti);
         nested_obj_1.default.set(_j, "strength", _p?.strength);
         nested_obj_1.default.set(_j, "waitPolicy", _p?.waitPolicy);
         nested_obj_1.default.set(_j, "pushedDown", _p?.pushedDown);
-        if (isNode) {
-            return {
-                RowMarkClause: _j
-            };
-        }
         return _j;
     },
-    withClause(_p, isNode) {
+    withClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "ctes", _p?.ctes);
         nested_obj_1.default.set(_j, "recursive", _p?.recursive);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                WithClause: _j
-            };
-        }
         return _j;
     },
-    inferClause(_p, isNode) {
+    inferClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "indexElems", _p?.indexElems);
         nested_obj_1.default.set(_j, "whereClause", _p?.whereClause);
         nested_obj_1.default.set(_j, "conname", _p?.conname);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                InferClause: _j
-            };
-        }
         return _j;
     },
-    onConflictClause(_p, isNode) {
+    onConflictClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "action", _p?.action);
         nested_obj_1.default.set(_j, "infer", _p?.infer);
         nested_obj_1.default.set(_j, "targetList", _p?.targetList);
         nested_obj_1.default.set(_j, "whereClause", _p?.whereClause);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                OnConflictClause: _j
-            };
-        }
         return _j;
     },
-    cteSearchClause(_p, isNode) {
+    cteSearchClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "search_col_list", _p?.search_col_list);
         nested_obj_1.default.set(_j, "search_breadth_first", _p?.search_breadth_first);
         nested_obj_1.default.set(_j, "search_seq_column", _p?.search_seq_column);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                CTESearchClause: _j
-            };
-        }
         return _j;
     },
-    cteCycleClause(_p, isNode) {
+    cteCycleClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "cycle_col_list", _p?.cycle_col_list);
         nested_obj_1.default.set(_j, "cycle_mark_column", _p?.cycle_mark_column);
@@ -1834,14 +1229,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "cycle_mark_typmod", _p?.cycle_mark_typmod);
         nested_obj_1.default.set(_j, "cycle_mark_collation", _p?.cycle_mark_collation);
         nested_obj_1.default.set(_j, "cycle_mark_neop", _p?.cycle_mark_neop);
-        if (isNode) {
-            return {
-                CTECycleClause: _j
-            };
-        }
         return _j;
     },
-    commonTableExpr(_p, isNode) {
+    commonTableExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "ctename", _p?.ctename);
         nested_obj_1.default.set(_j, "aliascolnames", _p?.aliascolnames);
@@ -1856,14 +1246,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "ctecoltypes", _p?.ctecoltypes);
         nested_obj_1.default.set(_j, "ctecoltypmods", _p?.ctecoltypmods);
         nested_obj_1.default.set(_j, "ctecolcollations", _p?.ctecolcollations);
-        if (isNode) {
-            return {
-                CommonTableExpr: _j
-            };
-        }
         return _j;
     },
-    mergeWhenClause(_p, isNode) {
+    mergeWhenClause(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "matchKind", _p?.matchKind);
         nested_obj_1.default.set(_j, "commandType", _p?.commandType);
@@ -1871,48 +1256,28 @@ exports.default = {
         nested_obj_1.default.set(_j, "condition", _p?.condition);
         nested_obj_1.default.set(_j, "targetList", _p?.targetList);
         nested_obj_1.default.set(_j, "values", _p?.values);
-        if (isNode) {
-            return {
-                MergeWhenClause: _j
-            };
-        }
         return _j;
     },
-    triggerTransition(_p, isNode) {
+    triggerTransition(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "isNew", _p?.isNew);
         nested_obj_1.default.set(_j, "isTable", _p?.isTable);
-        if (isNode) {
-            return {
-                TriggerTransition: _j
-            };
-        }
         return _j;
     },
-    jsonOutput(_p, isNode) {
+    jsonOutput(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "returning", _p?.returning);
-        if (isNode) {
-            return {
-                JsonOutput: _j
-            };
-        }
         return _j;
     },
-    jsonArgument(_p, isNode) {
+    jsonArgument(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "val", _p?.val);
         nested_obj_1.default.set(_j, "name", _p?.name);
-        if (isNode) {
-            return {
-                JsonArgument: _j
-            };
-        }
         return _j;
     },
-    jsonFuncExpr(_p, isNode) {
+    jsonFuncExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "op", _p?.op);
         nested_obj_1.default.set(_j, "column_name", _p?.column_name);
@@ -1925,27 +1290,17 @@ exports.default = {
         nested_obj_1.default.set(_j, "wrapper", _p?.wrapper);
         nested_obj_1.default.set(_j, "quotes", _p?.quotes);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonFuncExpr: _j
-            };
-        }
         return _j;
     },
-    jsonTablePathSpec(_p, isNode) {
+    jsonTablePathSpec(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "string", _p?.string);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "name_location", _p?.name_location);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonTablePathSpec: _j
-            };
-        }
         return _j;
     },
-    jsonTable(_p, isNode) {
+    jsonTable(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "context_item", _p?.context_item);
         nested_obj_1.default.set(_j, "pathspec", _p?.pathspec);
@@ -1955,14 +1310,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "alias", _p?.alias);
         nested_obj_1.default.set(_j, "lateral", _p?.lateral);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonTable: _j
-            };
-        }
         return _j;
     },
-    jsonTableColumn(_p, isNode) {
+    jsonTableColumn(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "coltype", _p?.coltype);
         nested_obj_1.default.set(_j, "name", _p?.name);
@@ -1975,154 +1325,94 @@ exports.default = {
         nested_obj_1.default.set(_j, "on_empty", _p?.on_empty);
         nested_obj_1.default.set(_j, "on_error", _p?.on_error);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonTableColumn: _j
-            };
-        }
         return _j;
     },
-    jsonKeyValue(_p, isNode) {
+    jsonKeyValue(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "key", _p?.key);
         nested_obj_1.default.set(_j, "value", _p?.value);
-        if (isNode) {
-            return {
-                JsonKeyValue: _j
-            };
-        }
         return _j;
     },
-    jsonParseExpr(_p, isNode) {
+    jsonParseExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "unique_keys", _p?.unique_keys);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonParseExpr: _j
-            };
-        }
         return _j;
     },
-    jsonScalarExpr(_p, isNode) {
+    jsonScalarExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonScalarExpr: _j
-            };
-        }
         return _j;
     },
-    jsonSerializeExpr(_p, isNode) {
+    jsonSerializeExpr(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "expr", _p?.expr);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonSerializeExpr: _j
-            };
-        }
         return _j;
     },
-    jsonObjectConstructor(_p, isNode) {
+    jsonObjectConstructor(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "exprs", _p?.exprs);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
         nested_obj_1.default.set(_j, "unique", _p?.unique);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonObjectConstructor: _j
-            };
-        }
         return _j;
     },
-    jsonArrayConstructor(_p, isNode) {
+    jsonArrayConstructor(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "exprs", _p?.exprs);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonArrayConstructor: _j
-            };
-        }
         return _j;
     },
-    jsonArrayQueryConstructor(_p, isNode) {
+    jsonArrayQueryConstructor(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "query", _p?.query);
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "format", _p?.format);
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonArrayQueryConstructor: _j
-            };
-        }
         return _j;
     },
-    jsonAggConstructor(_p, isNode) {
+    jsonAggConstructor(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "output", _p?.output);
         nested_obj_1.default.set(_j, "agg_filter", _p?.agg_filter);
         nested_obj_1.default.set(_j, "agg_order", _p?.agg_order);
         nested_obj_1.default.set(_j, "over", _p?.over);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                JsonAggConstructor: _j
-            };
-        }
         return _j;
     },
-    jsonObjectAgg(_p, isNode) {
+    jsonObjectAgg(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "constructor", _p?.constructor);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
         nested_obj_1.default.set(_j, "unique", _p?.unique);
-        if (isNode) {
-            return {
-                JsonObjectAgg: _j
-            };
-        }
         return _j;
     },
-    jsonArrayAgg(_p, isNode) {
+    jsonArrayAgg(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "constructor", _p?.constructor);
         nested_obj_1.default.set(_j, "arg", _p?.arg);
         nested_obj_1.default.set(_j, "absent_on_null", _p?.absent_on_null);
-        if (isNode) {
-            return {
-                JsonArrayAgg: _j
-            };
-        }
         return _j;
     },
-    rawStmt(_p, isNode) {
+    rawStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "stmt", _p?.stmt);
         nested_obj_1.default.set(_j, "stmt_location", _p?.stmt_location);
         nested_obj_1.default.set(_j, "stmt_len", _p?.stmt_len);
-        if (isNode) {
-            return {
-                RawStmt: _j
-            };
-        }
         return _j;
     },
-    insertStmt(_p, isNode) {
+    insertStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "cols", _p?.cols);
@@ -2131,28 +1421,18 @@ exports.default = {
         nested_obj_1.default.set(_j, "returningList", _p?.returningList);
         nested_obj_1.default.set(_j, "withClause", _p?.withClause);
         nested_obj_1.default.set(_j, "override", _p?.override);
-        if (isNode) {
-            return {
-                InsertStmt: _j
-            };
-        }
         return _j;
     },
-    deleteStmt(_p, isNode) {
+    deleteStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "usingClause", _p?.usingClause);
         nested_obj_1.default.set(_j, "whereClause", _p?.whereClause);
         nested_obj_1.default.set(_j, "returningList", _p?.returningList);
         nested_obj_1.default.set(_j, "withClause", _p?.withClause);
-        if (isNode) {
-            return {
-                DeleteStmt: _j
-            };
-        }
         return _j;
     },
-    updateStmt(_p, isNode) {
+    updateStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "targetList", _p?.targetList);
@@ -2160,14 +1440,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "fromClause", _p?.fromClause);
         nested_obj_1.default.set(_j, "returningList", _p?.returningList);
         nested_obj_1.default.set(_j, "withClause", _p?.withClause);
-        if (isNode) {
-            return {
-                UpdateStmt: _j
-            };
-        }
         return _j;
     },
-    mergeStmt(_p, isNode) {
+    mergeStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "sourceRelation", _p?.sourceRelation);
@@ -2175,14 +1450,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "mergeWhenClauses", _p?.mergeWhenClauses);
         nested_obj_1.default.set(_j, "returningList", _p?.returningList);
         nested_obj_1.default.set(_j, "withClause", _p?.withClause);
-        if (isNode) {
-            return {
-                MergeStmt: _j
-            };
-        }
         return _j;
     },
-    selectStmt(_p, isNode) {
+    selectStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "distinctClause", _p?.distinctClause);
         nested_obj_1.default.set(_j, "intoClause", _p?.intoClause);
@@ -2204,14 +1474,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "all", _p?.all);
         nested_obj_1.default.set(_j, "larg", _p?.larg);
         nested_obj_1.default.set(_j, "rarg", _p?.rarg);
-        if (isNode) {
-            return {
-                SelectStmt: _j
-            };
-        }
         return _j;
     },
-    setOperationStmt(_p, isNode) {
+    setOperationStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "op", _p?.op);
         nested_obj_1.default.set(_j, "all", _p?.all);
@@ -2221,75 +1486,45 @@ exports.default = {
         nested_obj_1.default.set(_j, "colTypmods", _p?.colTypmods);
         nested_obj_1.default.set(_j, "colCollations", _p?.colCollations);
         nested_obj_1.default.set(_j, "groupClauses", _p?.groupClauses);
-        if (isNode) {
-            return {
-                SetOperationStmt: _j
-            };
-        }
         return _j;
     },
-    returnStmt(_p, isNode) {
+    returnStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "returnval", _p?.returnval);
-        if (isNode) {
-            return {
-                ReturnStmt: _j
-            };
-        }
         return _j;
     },
-    plAssignStmt(_p, isNode) {
+    plAssignStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "indirection", _p?.indirection);
         nested_obj_1.default.set(_j, "nnames", _p?.nnames);
         nested_obj_1.default.set(_j, "val", _p?.val);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PLAssignStmt: _j
-            };
-        }
         return _j;
     },
-    createSchemaStmt(_p, isNode) {
+    createSchemaStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "schemaname", _p?.schemaname);
         nested_obj_1.default.set(_j, "authrole", _p?.authrole);
         nested_obj_1.default.set(_j, "schemaElts", _p?.schemaElts);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
-        if (isNode) {
-            return {
-                CreateSchemaStmt: _j
-            };
-        }
         return _j;
     },
-    alterTableStmt(_p, isNode) {
+    alterTableStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "cmds", _p?.cmds);
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterTableStmt: _j
-            };
-        }
         return _j;
     },
-    replicaIdentityStmt(_p, isNode) {
+    replicaIdentityStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "identity_type", _p?.identity_type);
         nested_obj_1.default.set(_j, "name", _p?.name);
-        if (isNode) {
-            return {
-                ReplicaIdentityStmt: _j
-            };
-        }
         return _j;
     },
-    alterTableCmd(_p, isNode) {
+    alterTableCmd(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "subtype", _p?.subtype);
         nested_obj_1.default.set(_j, "name", _p?.name);
@@ -2299,24 +1534,14 @@ exports.default = {
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
         nested_obj_1.default.set(_j, "recurse", _p?.recurse);
-        if (isNode) {
-            return {
-                AlterTableCmd: _j
-            };
-        }
         return _j;
     },
-    alterCollationStmt(_p, isNode) {
+    alterCollationStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "collname", _p?.collname);
-        if (isNode) {
-            return {
-                AlterCollationStmt: _j
-            };
-        }
         return _j;
     },
-    alterDomainStmt(_p, isNode) {
+    alterDomainStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "subtype", _p?.subtype);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
@@ -2324,14 +1549,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "def", _p?.def);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterDomainStmt: _j
-            };
-        }
         return _j;
     },
-    grantStmt(_p, isNode) {
+    grantStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "is_grant", _p?.is_grant);
         nested_obj_1.default.set(_j, "targtype", _p?.targtype);
@@ -2342,38 +1562,23 @@ exports.default = {
         nested_obj_1.default.set(_j, "grant_option", _p?.grant_option);
         nested_obj_1.default.set(_j, "grantor", _p?.grantor);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
-        if (isNode) {
-            return {
-                GrantStmt: _j
-            };
-        }
         return _j;
     },
-    objectWithArgs(_p, isNode) {
+    objectWithArgs(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objname", _p?.objname);
         nested_obj_1.default.set(_j, "objargs", _p?.objargs);
         nested_obj_1.default.set(_j, "objfuncargs", _p?.objfuncargs);
         nested_obj_1.default.set(_j, "args_unspecified", _p?.args_unspecified);
-        if (isNode) {
-            return {
-                ObjectWithArgs: _j
-            };
-        }
         return _j;
     },
-    accessPriv(_p, isNode) {
+    accessPriv(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "priv_name", _p?.priv_name);
         nested_obj_1.default.set(_j, "cols", _p?.cols);
-        if (isNode) {
-            return {
-                AccessPriv: _j
-            };
-        }
         return _j;
     },
-    grantRoleStmt(_p, isNode) {
+    grantRoleStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "granted_roles", _p?.granted_roles);
         nested_obj_1.default.set(_j, "grantee_roles", _p?.grantee_roles);
@@ -2381,25 +1586,15 @@ exports.default = {
         nested_obj_1.default.set(_j, "opt", _p?.opt);
         nested_obj_1.default.set(_j, "grantor", _p?.grantor);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
-        if (isNode) {
-            return {
-                GrantRoleStmt: _j
-            };
-        }
         return _j;
     },
-    alterDefaultPrivilegesStmt(_p, isNode) {
+    alterDefaultPrivilegesStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "action", _p?.action);
-        if (isNode) {
-            return {
-                AlterDefaultPrivilegesStmt: _j
-            };
-        }
         return _j;
     },
-    copyStmt(_p, isNode) {
+    copyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "query", _p?.query);
@@ -2409,37 +1604,22 @@ exports.default = {
         nested_obj_1.default.set(_j, "filename", _p?.filename);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "whereClause", _p?.whereClause);
-        if (isNode) {
-            return {
-                CopyStmt: _j
-            };
-        }
         return _j;
     },
-    variableSetStmt(_p, isNode) {
+    variableSetStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "args", _p?.args);
         nested_obj_1.default.set(_j, "is_local", _p?.is_local);
-        if (isNode) {
-            return {
-                VariableSetStmt: _j
-            };
-        }
         return _j;
     },
-    variableShowStmt(_p, isNode) {
+    variableShowStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
-        if (isNode) {
-            return {
-                VariableShowStmt: _j
-            };
-        }
         return _j;
     },
-    createStmt(_p, isNode) {
+    createStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "tableElts", _p?.tableElts);
@@ -2453,14 +1633,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "tablespacename", _p?.tablespacename);
         nested_obj_1.default.set(_j, "accessMethod", _p?.accessMethod);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
-        if (isNode) {
-            return {
-                CreateStmt: _j
-            };
-        }
         return _j;
     },
-    constraint(_p, isNode) {
+    constraint(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "contype", _p?.contype);
         nested_obj_1.default.set(_j, "conname", _p?.conname);
@@ -2493,124 +1668,74 @@ exports.default = {
         nested_obj_1.default.set(_j, "old_conpfeqop", _p?.old_conpfeqop);
         nested_obj_1.default.set(_j, "old_pktable_oid", _p?.old_pktable_oid);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                Constraint: _j
-            };
-        }
         return _j;
     },
-    createTableSpaceStmt(_p, isNode) {
+    createTableSpaceStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "tablespacename", _p?.tablespacename);
         nested_obj_1.default.set(_j, "owner", _p?.owner);
         nested_obj_1.default.set(_j, "location", _p?.location);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateTableSpaceStmt: _j
-            };
-        }
         return _j;
     },
-    dropTableSpaceStmt(_p, isNode) {
+    dropTableSpaceStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "tablespacename", _p?.tablespacename);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                DropTableSpaceStmt: _j
-            };
-        }
         return _j;
     },
-    alterTableSpaceOptionsStmt(_p, isNode) {
+    alterTableSpaceOptionsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "tablespacename", _p?.tablespacename);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "isReset", _p?.isReset);
-        if (isNode) {
-            return {
-                AlterTableSpaceOptionsStmt: _j
-            };
-        }
         return _j;
     },
-    alterTableMoveAllStmt(_p, isNode) {
+    alterTableMoveAllStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "orig_tablespacename", _p?.orig_tablespacename);
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "new_tablespacename", _p?.new_tablespacename);
         nested_obj_1.default.set(_j, "nowait", _p?.nowait);
-        if (isNode) {
-            return {
-                AlterTableMoveAllStmt: _j
-            };
-        }
         return _j;
     },
-    createExtensionStmt(_p, isNode) {
+    createExtensionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "extname", _p?.extname);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateExtensionStmt: _j
-            };
-        }
         return _j;
     },
-    alterExtensionStmt(_p, isNode) {
+    alterExtensionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "extname", _p?.extname);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterExtensionStmt: _j
-            };
-        }
         return _j;
     },
-    alterExtensionContentsStmt(_p, isNode) {
+    alterExtensionContentsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "extname", _p?.extname);
         nested_obj_1.default.set(_j, "action", _p?.action);
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "object", _p?.object);
-        if (isNode) {
-            return {
-                AlterExtensionContentsStmt: _j
-            };
-        }
         return _j;
     },
-    createFdwStmt(_p, isNode) {
+    createFdwStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "fdwname", _p?.fdwname);
         nested_obj_1.default.set(_j, "func_options", _p?.func_options);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateFdwStmt: _j
-            };
-        }
         return _j;
     },
-    alterFdwStmt(_p, isNode) {
+    alterFdwStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "fdwname", _p?.fdwname);
         nested_obj_1.default.set(_j, "func_options", _p?.func_options);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterFdwStmt: _j
-            };
-        }
         return _j;
     },
-    createForeignServerStmt(_p, isNode) {
+    createForeignServerStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "servertype", _p?.servertype);
@@ -2618,76 +1743,46 @@ exports.default = {
         nested_obj_1.default.set(_j, "fdwname", _p?.fdwname);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateForeignServerStmt: _j
-            };
-        }
         return _j;
     },
-    alterForeignServerStmt(_p, isNode) {
+    alterForeignServerStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "version", _p?.version);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "has_version", _p?.has_version);
-        if (isNode) {
-            return {
-                AlterForeignServerStmt: _j
-            };
-        }
         return _j;
     },
-    createForeignTableStmt(_p, isNode) {
+    createForeignTableStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "base", _p?.base);
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateForeignTableStmt: _j
-            };
-        }
         return _j;
     },
-    createUserMappingStmt(_p, isNode) {
+    createUserMappingStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "user", _p?.user);
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateUserMappingStmt: _j
-            };
-        }
         return _j;
     },
-    alterUserMappingStmt(_p, isNode) {
+    alterUserMappingStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "user", _p?.user);
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterUserMappingStmt: _j
-            };
-        }
         return _j;
     },
-    dropUserMappingStmt(_p, isNode) {
+    dropUserMappingStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "user", _p?.user);
         nested_obj_1.default.set(_j, "servername", _p?.servername);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                DropUserMappingStmt: _j
-            };
-        }
         return _j;
     },
-    importForeignSchemaStmt(_p, isNode) {
+    importForeignSchemaStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "server_name", _p?.server_name);
         nested_obj_1.default.set(_j, "remote_schema", _p?.remote_schema);
@@ -2695,14 +1790,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "list_type", _p?.list_type);
         nested_obj_1.default.set(_j, "table_list", _p?.table_list);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                ImportForeignSchemaStmt: _j
-            };
-        }
         return _j;
     },
-    createPolicyStmt(_p, isNode) {
+    createPolicyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "policy_name", _p?.policy_name);
         nested_obj_1.default.set(_j, "table", _p?.table);
@@ -2711,40 +1801,25 @@ exports.default = {
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "qual", _p?.qual);
         nested_obj_1.default.set(_j, "with_check", _p?.with_check);
-        if (isNode) {
-            return {
-                CreatePolicyStmt: _j
-            };
-        }
         return _j;
     },
-    alterPolicyStmt(_p, isNode) {
+    alterPolicyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "policy_name", _p?.policy_name);
         nested_obj_1.default.set(_j, "table", _p?.table);
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "qual", _p?.qual);
         nested_obj_1.default.set(_j, "with_check", _p?.with_check);
-        if (isNode) {
-            return {
-                AlterPolicyStmt: _j
-            };
-        }
         return _j;
     },
-    createAmStmt(_p, isNode) {
+    createAmStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "amname", _p?.amname);
         nested_obj_1.default.set(_j, "handler_name", _p?.handler_name);
         nested_obj_1.default.set(_j, "amtype", _p?.amtype);
-        if (isNode) {
-            return {
-                CreateAmStmt: _j
-            };
-        }
         return _j;
     },
-    createTrigStmt(_p, isNode) {
+    createTrigStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "replace", _p?.replace);
         nested_obj_1.default.set(_j, "isconstraint", _p?.isconstraint);
@@ -2761,38 +1836,23 @@ exports.default = {
         nested_obj_1.default.set(_j, "deferrable", _p?.deferrable);
         nested_obj_1.default.set(_j, "initdeferred", _p?.initdeferred);
         nested_obj_1.default.set(_j, "constrrel", _p?.constrrel);
-        if (isNode) {
-            return {
-                CreateTrigStmt: _j
-            };
-        }
         return _j;
     },
-    createEventTrigStmt(_p, isNode) {
+    createEventTrigStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "trigname", _p?.trigname);
         nested_obj_1.default.set(_j, "eventname", _p?.eventname);
         nested_obj_1.default.set(_j, "whenclause", _p?.whenclause);
         nested_obj_1.default.set(_j, "funcname", _p?.funcname);
-        if (isNode) {
-            return {
-                CreateEventTrigStmt: _j
-            };
-        }
         return _j;
     },
-    alterEventTrigStmt(_p, isNode) {
+    alterEventTrigStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "trigname", _p?.trigname);
         nested_obj_1.default.set(_j, "tgenabled", _p?.tgenabled);
-        if (isNode) {
-            return {
-                AlterEventTrigStmt: _j
-            };
-        }
         return _j;
     },
-    createpLangStmt(_p, isNode) {
+    createpLangStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "replace", _p?.replace);
         nested_obj_1.default.set(_j, "plname", _p?.plname);
@@ -2800,88 +1860,53 @@ exports.default = {
         nested_obj_1.default.set(_j, "plinline", _p?.plinline);
         nested_obj_1.default.set(_j, "plvalidator", _p?.plvalidator);
         nested_obj_1.default.set(_j, "pltrusted", _p?.pltrusted);
-        if (isNode) {
-            return {
-                CreatePLangStmt: _j
-            };
-        }
         return _j;
     },
-    createRoleStmt(_p, isNode) {
+    createRoleStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "stmt_type", _p?.stmt_type);
         nested_obj_1.default.set(_j, "role", _p?.role);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateRoleStmt: _j
-            };
-        }
         return _j;
     },
-    alterRoleStmt(_p, isNode) {
+    alterRoleStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "role", _p?.role);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "action", _p?.action);
-        if (isNode) {
-            return {
-                AlterRoleStmt: _j
-            };
-        }
         return _j;
     },
-    alterRoleSetStmt(_p, isNode) {
+    alterRoleSetStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "role", _p?.role);
         nested_obj_1.default.set(_j, "database", _p?.database);
         nested_obj_1.default.set(_j, "setstmt", _p?.setstmt);
-        if (isNode) {
-            return {
-                AlterRoleSetStmt: _j
-            };
-        }
         return _j;
     },
-    dropRoleStmt(_p, isNode) {
+    dropRoleStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                DropRoleStmt: _j
-            };
-        }
         return _j;
     },
-    createSeqStmt(_p, isNode) {
+    createSeqStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "sequence", _p?.sequence);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "ownerId", _p?.ownerId);
         nested_obj_1.default.set(_j, "for_identity", _p?.for_identity);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
-        if (isNode) {
-            return {
-                CreateSeqStmt: _j
-            };
-        }
         return _j;
     },
-    alterSeqStmt(_p, isNode) {
+    alterSeqStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "sequence", _p?.sequence);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "for_identity", _p?.for_identity);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterSeqStmt: _j
-            };
-        }
         return _j;
     },
-    defineStmt(_p, isNode) {
+    defineStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "oldstyle", _p?.oldstyle);
@@ -2890,27 +1915,17 @@ exports.default = {
         nested_obj_1.default.set(_j, "definition", _p?.definition);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
         nested_obj_1.default.set(_j, "replace", _p?.replace);
-        if (isNode) {
-            return {
-                DefineStmt: _j
-            };
-        }
         return _j;
     },
-    createDomainStmt(_p, isNode) {
+    createDomainStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "domainname", _p?.domainname);
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "collClause", _p?.collClause);
         nested_obj_1.default.set(_j, "constraints", _p?.constraints);
-        if (isNode) {
-            return {
-                CreateDomainStmt: _j
-            };
-        }
         return _j;
     },
-    createOpClassStmt(_p, isNode) {
+    createOpClassStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "opclassname", _p?.opclassname);
         nested_obj_1.default.set(_j, "opfamilyname", _p?.opfamilyname);
@@ -2918,14 +1933,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "datatype", _p?.datatype);
         nested_obj_1.default.set(_j, "items", _p?.items);
         nested_obj_1.default.set(_j, "isDefault", _p?.isDefault);
-        if (isNode) {
-            return {
-                CreateOpClassStmt: _j
-            };
-        }
         return _j;
     },
-    createOpClassItem(_p, isNode) {
+    createOpClassItem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "itemtype", _p?.itemtype);
         nested_obj_1.default.set(_j, "name", _p?.name);
@@ -2933,124 +1943,74 @@ exports.default = {
         nested_obj_1.default.set(_j, "order_family", _p?.order_family);
         nested_obj_1.default.set(_j, "class_args", _p?.class_args);
         nested_obj_1.default.set(_j, "storedtype", _p?.storedtype);
-        if (isNode) {
-            return {
-                CreateOpClassItem: _j
-            };
-        }
         return _j;
     },
-    createOpFamilyStmt(_p, isNode) {
+    createOpFamilyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "opfamilyname", _p?.opfamilyname);
         nested_obj_1.default.set(_j, "amname", _p?.amname);
-        if (isNode) {
-            return {
-                CreateOpFamilyStmt: _j
-            };
-        }
         return _j;
     },
-    alterOpFamilyStmt(_p, isNode) {
+    alterOpFamilyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "opfamilyname", _p?.opfamilyname);
         nested_obj_1.default.set(_j, "amname", _p?.amname);
         nested_obj_1.default.set(_j, "isDrop", _p?.isDrop);
         nested_obj_1.default.set(_j, "items", _p?.items);
-        if (isNode) {
-            return {
-                AlterOpFamilyStmt: _j
-            };
-        }
         return _j;
     },
-    dropStmt(_p, isNode) {
+    dropStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objects", _p?.objects);
         nested_obj_1.default.set(_j, "removeType", _p?.removeType);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
         nested_obj_1.default.set(_j, "concurrent", _p?.concurrent);
-        if (isNode) {
-            return {
-                DropStmt: _j
-            };
-        }
         return _j;
     },
-    truncateStmt(_p, isNode) {
+    truncateStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relations", _p?.relations);
         nested_obj_1.default.set(_j, "restart_seqs", _p?.restart_seqs);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
-        if (isNode) {
-            return {
-                TruncateStmt: _j
-            };
-        }
         return _j;
     },
-    commentStmt(_p, isNode) {
+    commentStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "object", _p?.object);
         nested_obj_1.default.set(_j, "comment", _p?.comment);
-        if (isNode) {
-            return {
-                CommentStmt: _j
-            };
-        }
         return _j;
     },
-    secLabelStmt(_p, isNode) {
+    secLabelStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "object", _p?.object);
         nested_obj_1.default.set(_j, "provider", _p?.provider);
         nested_obj_1.default.set(_j, "label", _p?.label);
-        if (isNode) {
-            return {
-                SecLabelStmt: _j
-            };
-        }
         return _j;
     },
-    declareCursorStmt(_p, isNode) {
+    declareCursorStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "portalname", _p?.portalname);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "query", _p?.query);
-        if (isNode) {
-            return {
-                DeclareCursorStmt: _j
-            };
-        }
         return _j;
     },
-    closePortalStmt(_p, isNode) {
+    closePortalStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "portalname", _p?.portalname);
-        if (isNode) {
-            return {
-                ClosePortalStmt: _j
-            };
-        }
         return _j;
     },
-    fetchStmt(_p, isNode) {
+    fetchStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "direction", _p?.direction);
         nested_obj_1.default.set(_j, "howMany", _p?.howMany);
         nested_obj_1.default.set(_j, "portalname", _p?.portalname);
         nested_obj_1.default.set(_j, "ismove", _p?.ismove);
-        if (isNode) {
-            return {
-                FetchStmt: _j
-            };
-        }
         return _j;
     },
-    indexStmt(_p, isNode) {
+    indexStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "idxname", _p?.idxname);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
@@ -3076,14 +2036,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "concurrent", _p?.concurrent);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
         nested_obj_1.default.set(_j, "reset_default_tblspc", _p?.reset_default_tblspc);
-        if (isNode) {
-            return {
-                IndexStmt: _j
-            };
-        }
         return _j;
     },
-    createStatsStmt(_p, isNode) {
+    createStatsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "defnames", _p?.defnames);
         nested_obj_1.default.set(_j, "stat_types", _p?.stat_types);
@@ -3092,37 +2047,22 @@ exports.default = {
         nested_obj_1.default.set(_j, "stxcomment", _p?.stxcomment);
         nested_obj_1.default.set(_j, "transformed", _p?.transformed);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
-        if (isNode) {
-            return {
-                CreateStatsStmt: _j
-            };
-        }
         return _j;
     },
-    statsElem(_p, isNode) {
+    statsElem(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "expr", _p?.expr);
-        if (isNode) {
-            return {
-                StatsElem: _j
-            };
-        }
         return _j;
     },
-    alterStatsStmt(_p, isNode) {
+    alterStatsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "defnames", _p?.defnames);
         nested_obj_1.default.set(_j, "stxstattarget", _p?.stxstattarget);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterStatsStmt: _j
-            };
-        }
         return _j;
     },
-    createFunctionStmt(_p, isNode) {
+    createFunctionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "is_procedure", _p?.is_procedure);
         nested_obj_1.default.set(_j, "replace", _p?.replace);
@@ -3131,84 +2071,49 @@ exports.default = {
         nested_obj_1.default.set(_j, "returnType", _p?.returnType);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "sql_body", _p?.sql_body);
-        if (isNode) {
-            return {
-                CreateFunctionStmt: _j
-            };
-        }
         return _j;
     },
-    functionParameter(_p, isNode) {
+    functionParameter(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "argType", _p?.argType);
         nested_obj_1.default.set(_j, "mode", _p?.mode);
         nested_obj_1.default.set(_j, "defexpr", _p?.defexpr);
-        if (isNode) {
-            return {
-                FunctionParameter: _j
-            };
-        }
         return _j;
     },
-    alterFunctionStmt(_p, isNode) {
+    alterFunctionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "func", _p?.func);
         nested_obj_1.default.set(_j, "actions", _p?.actions);
-        if (isNode) {
-            return {
-                AlterFunctionStmt: _j
-            };
-        }
         return _j;
     },
-    doStmt(_p, isNode) {
+    doStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "args", _p?.args);
-        if (isNode) {
-            return {
-                DoStmt: _j
-            };
-        }
         return _j;
     },
-    inlineCodeBlock(_p, isNode) {
+    inlineCodeBlock(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "source_text", _p?.source_text);
         nested_obj_1.default.set(_j, "langOid", _p?.langOid);
         nested_obj_1.default.set(_j, "langIsTrusted", _p?.langIsTrusted);
         nested_obj_1.default.set(_j, "atomic", _p?.atomic);
-        if (isNode) {
-            return {
-                InlineCodeBlock: _j
-            };
-        }
         return _j;
     },
-    callStmt(_p, isNode) {
+    callStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "funccall", _p?.funccall);
         nested_obj_1.default.set(_j, "funcexpr", _p?.funcexpr);
         nested_obj_1.default.set(_j, "outargs", _p?.outargs);
-        if (isNode) {
-            return {
-                CallStmt: _j
-            };
-        }
         return _j;
     },
-    callContext(_p, isNode) {
+    callContext(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "atomic", _p?.atomic);
-        if (isNode) {
-            return {
-                CallContext: _j
-            };
-        }
         return _j;
     },
-    renameStmt(_p, isNode) {
+    renameStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "renameType", _p?.renameType);
         nested_obj_1.default.set(_j, "relationType", _p?.relationType);
@@ -3218,77 +2123,47 @@ exports.default = {
         nested_obj_1.default.set(_j, "newname", _p?.newname);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                RenameStmt: _j
-            };
-        }
         return _j;
     },
-    alterObjectDependsStmt(_p, isNode) {
+    alterObjectDependsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objectType", _p?.objectType);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "object", _p?.object);
         nested_obj_1.default.set(_j, "extname", _p?.extname);
         nested_obj_1.default.set(_j, "remove", _p?.remove);
-        if (isNode) {
-            return {
-                AlterObjectDependsStmt: _j
-            };
-        }
         return _j;
     },
-    alterObjectSchemaStmt(_p, isNode) {
+    alterObjectSchemaStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objectType", _p?.objectType);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "object", _p?.object);
         nested_obj_1.default.set(_j, "newschema", _p?.newschema);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterObjectSchemaStmt: _j
-            };
-        }
         return _j;
     },
-    alterOwnerStmt(_p, isNode) {
+    alterOwnerStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "objectType", _p?.objectType);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "object", _p?.object);
         nested_obj_1.default.set(_j, "newowner", _p?.newowner);
-        if (isNode) {
-            return {
-                AlterOwnerStmt: _j
-            };
-        }
         return _j;
     },
-    alterOperatorStmt(_p, isNode) {
+    alterOperatorStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "opername", _p?.opername);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterOperatorStmt: _j
-            };
-        }
         return _j;
     },
-    alterTypeStmt(_p, isNode) {
+    alterTypeStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterTypeStmt: _j
-            };
-        }
         return _j;
     },
-    ruleStmt(_p, isNode) {
+    ruleStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "rulename", _p?.rulename);
@@ -3297,45 +2172,25 @@ exports.default = {
         nested_obj_1.default.set(_j, "instead", _p?.instead);
         nested_obj_1.default.set(_j, "actions", _p?.actions);
         nested_obj_1.default.set(_j, "replace", _p?.replace);
-        if (isNode) {
-            return {
-                RuleStmt: _j
-            };
-        }
         return _j;
     },
-    notifyStmt(_p, isNode) {
+    notifyStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "conditionname", _p?.conditionname);
         nested_obj_1.default.set(_j, "payload", _p?.payload);
-        if (isNode) {
-            return {
-                NotifyStmt: _j
-            };
-        }
         return _j;
     },
-    listenStmt(_p, isNode) {
+    listenStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "conditionname", _p?.conditionname);
-        if (isNode) {
-            return {
-                ListenStmt: _j
-            };
-        }
         return _j;
     },
-    unlistenStmt(_p, isNode) {
+    unlistenStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "conditionname", _p?.conditionname);
-        if (isNode) {
-            return {
-                UnlistenStmt: _j
-            };
-        }
         return _j;
     },
-    transactionStmt(_p, isNode) {
+    transactionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "options", _p?.options);
@@ -3343,47 +2198,27 @@ exports.default = {
         nested_obj_1.default.set(_j, "gid", _p?.gid);
         nested_obj_1.default.set(_j, "chain", _p?.chain);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                TransactionStmt: _j
-            };
-        }
         return _j;
     },
-    compositeTypeStmt(_p, isNode) {
+    compositeTypeStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typevar", _p?.typevar);
         nested_obj_1.default.set(_j, "coldeflist", _p?.coldeflist);
-        if (isNode) {
-            return {
-                CompositeTypeStmt: _j
-            };
-        }
         return _j;
     },
-    createEnumStmt(_p, isNode) {
+    createEnumStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "vals", _p?.vals);
-        if (isNode) {
-            return {
-                CreateEnumStmt: _j
-            };
-        }
         return _j;
     },
-    createRangeStmt(_p, isNode) {
+    createRangeStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "params", _p?.params);
-        if (isNode) {
-            return {
-                CreateRangeStmt: _j
-            };
-        }
         return _j;
     },
-    alterEnumStmt(_p, isNode) {
+    alterEnumStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "typeName", _p?.typeName);
         nested_obj_1.default.set(_j, "oldVal", _p?.oldVal);
@@ -3391,14 +2226,9 @@ exports.default = {
         nested_obj_1.default.set(_j, "newValNeighbor", _p?.newValNeighbor);
         nested_obj_1.default.set(_j, "newValIsAfter", _p?.newValIsAfter);
         nested_obj_1.default.set(_j, "skipIfNewValExists", _p?.skipIfNewValExists);
-        if (isNode) {
-            return {
-                AlterEnumStmt: _j
-            };
-        }
         return _j;
     },
-    viewStmt(_p, isNode) {
+    viewStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "view", _p?.view);
         nested_obj_1.default.set(_j, "aliases", _p?.aliases);
@@ -3406,327 +2236,187 @@ exports.default = {
         nested_obj_1.default.set(_j, "replace", _p?.replace);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "withCheckOption", _p?.withCheckOption);
-        if (isNode) {
-            return {
-                ViewStmt: _j
-            };
-        }
         return _j;
     },
-    loadStmt(_p, isNode) {
+    loadStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "filename", _p?.filename);
-        if (isNode) {
-            return {
-                LoadStmt: _j
-            };
-        }
         return _j;
     },
-    createdbStmt(_p, isNode) {
+    createdbStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dbname", _p?.dbname);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreatedbStmt: _j
-            };
-        }
         return _j;
     },
-    alterDatabaseStmt(_p, isNode) {
+    alterDatabaseStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dbname", _p?.dbname);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterDatabaseStmt: _j
-            };
-        }
         return _j;
     },
-    alterDatabaseRefreshCollStmt(_p, isNode) {
+    alterDatabaseRefreshCollStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dbname", _p?.dbname);
-        if (isNode) {
-            return {
-                AlterDatabaseRefreshCollStmt: _j
-            };
-        }
         return _j;
     },
-    alterDatabaseSetStmt(_p, isNode) {
+    alterDatabaseSetStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dbname", _p?.dbname);
         nested_obj_1.default.set(_j, "setstmt", _p?.setstmt);
-        if (isNode) {
-            return {
-                AlterDatabaseSetStmt: _j
-            };
-        }
         return _j;
     },
-    dropdbStmt(_p, isNode) {
+    dropdbStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dbname", _p?.dbname);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                DropdbStmt: _j
-            };
-        }
         return _j;
     },
-    alterSystemStmt(_p, isNode) {
+    alterSystemStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "setstmt", _p?.setstmt);
-        if (isNode) {
-            return {
-                AlterSystemStmt: _j
-            };
-        }
         return _j;
     },
-    clusterStmt(_p, isNode) {
+    clusterStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "indexname", _p?.indexname);
         nested_obj_1.default.set(_j, "params", _p?.params);
-        if (isNode) {
-            return {
-                ClusterStmt: _j
-            };
-        }
         return _j;
     },
-    vacuumStmt(_p, isNode) {
+    vacuumStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "rels", _p?.rels);
         nested_obj_1.default.set(_j, "is_vacuumcmd", _p?.is_vacuumcmd);
-        if (isNode) {
-            return {
-                VacuumStmt: _j
-            };
-        }
         return _j;
     },
-    vacuumRelation(_p, isNode) {
+    vacuumRelation(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "oid", _p?.oid);
         nested_obj_1.default.set(_j, "va_cols", _p?.va_cols);
-        if (isNode) {
-            return {
-                VacuumRelation: _j
-            };
-        }
         return _j;
     },
-    explainStmt(_p, isNode) {
+    explainStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "query", _p?.query);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                ExplainStmt: _j
-            };
-        }
         return _j;
     },
-    createTableAsStmt(_p, isNode) {
+    createTableAsStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "query", _p?.query);
         nested_obj_1.default.set(_j, "into", _p?.into);
         nested_obj_1.default.set(_j, "objtype", _p?.objtype);
         nested_obj_1.default.set(_j, "is_select_into", _p?.is_select_into);
         nested_obj_1.default.set(_j, "if_not_exists", _p?.if_not_exists);
-        if (isNode) {
-            return {
-                CreateTableAsStmt: _j
-            };
-        }
         return _j;
     },
-    refreshMatViewStmt(_p, isNode) {
+    refreshMatViewStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "concurrent", _p?.concurrent);
         nested_obj_1.default.set(_j, "skipData", _p?.skipData);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
-        if (isNode) {
-            return {
-                RefreshMatViewStmt: _j
-            };
-        }
         return _j;
     },
-    checkPointStmt(_p, isNode) {
+    checkPointStmt(_p) {
         const _j = {};
-        if (isNode) {
-            return {
-                CheckPointStmt: _j
-            };
-        }
         return _j;
     },
-    discardStmt(_p, isNode) {
+    discardStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "target", _p?.target);
-        if (isNode) {
-            return {
-                DiscardStmt: _j
-            };
-        }
         return _j;
     },
-    lockStmt(_p, isNode) {
+    lockStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relations", _p?.relations);
         nested_obj_1.default.set(_j, "mode", _p?.mode);
         nested_obj_1.default.set(_j, "nowait", _p?.nowait);
-        if (isNode) {
-            return {
-                LockStmt: _j
-            };
-        }
         return _j;
     },
-    constraintsSetStmt(_p, isNode) {
+    constraintsSetStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "constraints", _p?.constraints);
         nested_obj_1.default.set(_j, "deferred", _p?.deferred);
-        if (isNode) {
-            return {
-                ConstraintsSetStmt: _j
-            };
-        }
         return _j;
     },
-    reindexStmt(_p, isNode) {
+    reindexStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "params", _p?.params);
-        if (isNode) {
-            return {
-                ReindexStmt: _j
-            };
-        }
         return _j;
     },
-    createConversionStmt(_p, isNode) {
+    createConversionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "conversion_name", _p?.conversion_name);
         nested_obj_1.default.set(_j, "for_encoding_name", _p?.for_encoding_name);
         nested_obj_1.default.set(_j, "to_encoding_name", _p?.to_encoding_name);
         nested_obj_1.default.set(_j, "func_name", _p?.func_name);
         nested_obj_1.default.set(_j, "def", _p?.def);
-        if (isNode) {
-            return {
-                CreateConversionStmt: _j
-            };
-        }
         return _j;
     },
-    createCastStmt(_p, isNode) {
+    createCastStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "sourcetype", _p?.sourcetype);
         nested_obj_1.default.set(_j, "targettype", _p?.targettype);
         nested_obj_1.default.set(_j, "func", _p?.func);
         nested_obj_1.default.set(_j, "context", _p?.context);
         nested_obj_1.default.set(_j, "inout", _p?.inout);
-        if (isNode) {
-            return {
-                CreateCastStmt: _j
-            };
-        }
         return _j;
     },
-    createTransformStmt(_p, isNode) {
+    createTransformStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "replace", _p?.replace);
         nested_obj_1.default.set(_j, "type_name", _p?.type_name);
         nested_obj_1.default.set(_j, "lang", _p?.lang);
         nested_obj_1.default.set(_j, "fromsql", _p?.fromsql);
         nested_obj_1.default.set(_j, "tosql", _p?.tosql);
-        if (isNode) {
-            return {
-                CreateTransformStmt: _j
-            };
-        }
         return _j;
     },
-    prepareStmt(_p, isNode) {
+    prepareStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "argtypes", _p?.argtypes);
         nested_obj_1.default.set(_j, "query", _p?.query);
-        if (isNode) {
-            return {
-                PrepareStmt: _j
-            };
-        }
         return _j;
     },
-    executeStmt(_p, isNode) {
+    executeStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "params", _p?.params);
-        if (isNode) {
-            return {
-                ExecuteStmt: _j
-            };
-        }
         return _j;
     },
-    deallocateStmt(_p, isNode) {
+    deallocateStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "isall", _p?.isall);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                DeallocateStmt: _j
-            };
-        }
         return _j;
     },
-    dropOwnedStmt(_p, isNode) {
+    dropOwnedStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
-        if (isNode) {
-            return {
-                DropOwnedStmt: _j
-            };
-        }
         return _j;
     },
-    reassignOwnedStmt(_p, isNode) {
+    reassignOwnedStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "roles", _p?.roles);
         nested_obj_1.default.set(_j, "newrole", _p?.newrole);
-        if (isNode) {
-            return {
-                ReassignOwnedStmt: _j
-            };
-        }
         return _j;
     },
-    altertsDictionaryStmt(_p, isNode) {
+    altertsDictionaryStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "dictname", _p?.dictname);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterTSDictionaryStmt: _j
-            };
-        }
         return _j;
     },
-    altertsConfigurationStmt(_p, isNode) {
+    altertsConfigurationStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "cfgname", _p?.cfgname);
@@ -3735,115 +2425,70 @@ exports.default = {
         nested_obj_1.default.set(_j, "override", _p?.override);
         nested_obj_1.default.set(_j, "replace", _p?.replace);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
-        if (isNode) {
-            return {
-                AlterTSConfigurationStmt: _j
-            };
-        }
         return _j;
     },
-    publicationTable(_p, isNode) {
+    publicationTable(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "relation", _p?.relation);
         nested_obj_1.default.set(_j, "whereClause", _p?.whereClause);
         nested_obj_1.default.set(_j, "columns", _p?.columns);
-        if (isNode) {
-            return {
-                PublicationTable: _j
-            };
-        }
         return _j;
     },
-    publicationObjSpec(_p, isNode) {
+    publicationObjSpec(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "pubobjtype", _p?.pubobjtype);
         nested_obj_1.default.set(_j, "name", _p?.name);
         nested_obj_1.default.set(_j, "pubtable", _p?.pubtable);
         nested_obj_1.default.set(_j, "location", _p?.location);
-        if (isNode) {
-            return {
-                PublicationObjSpec: _j
-            };
-        }
         return _j;
     },
-    createPublicationStmt(_p, isNode) {
+    createPublicationStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "pubname", _p?.pubname);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "pubobjects", _p?.pubobjects);
         nested_obj_1.default.set(_j, "for_all_tables", _p?.for_all_tables);
-        if (isNode) {
-            return {
-                CreatePublicationStmt: _j
-            };
-        }
         return _j;
     },
-    alterPublicationStmt(_p, isNode) {
+    alterPublicationStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "pubname", _p?.pubname);
         nested_obj_1.default.set(_j, "options", _p?.options);
         nested_obj_1.default.set(_j, "pubobjects", _p?.pubobjects);
         nested_obj_1.default.set(_j, "for_all_tables", _p?.for_all_tables);
         nested_obj_1.default.set(_j, "action", _p?.action);
-        if (isNode) {
-            return {
-                AlterPublicationStmt: _j
-            };
-        }
         return _j;
     },
-    createSubscriptionStmt(_p, isNode) {
+    createSubscriptionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "subname", _p?.subname);
         nested_obj_1.default.set(_j, "conninfo", _p?.conninfo);
         nested_obj_1.default.set(_j, "publication", _p?.publication);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                CreateSubscriptionStmt: _j
-            };
-        }
         return _j;
     },
-    alterSubscriptionStmt(_p, isNode) {
+    alterSubscriptionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "kind", _p?.kind);
         nested_obj_1.default.set(_j, "subname", _p?.subname);
         nested_obj_1.default.set(_j, "conninfo", _p?.conninfo);
         nested_obj_1.default.set(_j, "publication", _p?.publication);
         nested_obj_1.default.set(_j, "options", _p?.options);
-        if (isNode) {
-            return {
-                AlterSubscriptionStmt: _j
-            };
-        }
         return _j;
     },
-    dropSubscriptionStmt(_p, isNode) {
+    dropSubscriptionStmt(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "subname", _p?.subname);
         nested_obj_1.default.set(_j, "missing_ok", _p?.missing_ok);
         nested_obj_1.default.set(_j, "behavior", _p?.behavior);
-        if (isNode) {
-            return {
-                DropSubscriptionStmt: _j
-            };
-        }
         return _j;
     },
-    scanToken(_p, isNode) {
+    scanToken(_p) {
         const _j = {};
         nested_obj_1.default.set(_j, "start", _p?.start);
         nested_obj_1.default.set(_j, "end", _p?.end);
         nested_obj_1.default.set(_j, "token", _p?.token);
         nested_obj_1.default.set(_j, "keywordKind", _p?.keywordKind);
-        if (isNode) {
-            return {
-                ScanToken: _j
-            };
-        }
         return _j;
     }
 };