pg_query 2.2.1 → 4.2.1

data/ext/pg_query/include/pg_query_outfuncs_conds.c

@@ -1,19 +1,19 @@
 // This file is autogenerated by ./scripts/generate_protobuf_and_funcs.rb
 
 case T_Integer:
-  OUT_NODE(Integer, Integer, integer, INTEGER, Value, integer);
+  OUT_NODE(Integer, Integer, integer, INTEGER, Integer, integer);
+  break;
+case T_Boolean:
+  OUT_NODE(Boolean, Boolean, boolean, BOOLEAN, Boolean, boolean);
   break;
 case T_Float:
-  OUT_NODE(Float, Float, float, FLOAT, Value, float_);
+  OUT_NODE(Float, Float, float, FLOAT, Float, float_);
   break;
 case T_String:
-  OUT_NODE(String, String, string, STRING, Value, string);
+  OUT_NODE(String, String, string, STRING, String, string);
   break;
 case T_BitString:
-  OUT_NODE(BitString, BitString, bit_string, BIT_STRING, Value, bit_string);
-  break;
-case T_Null:
-  OUT_NODE(Null, Null, null, NULL, Value, null);
+  OUT_NODE(BitString, BitString, bit_string, BIT_STRING, BitString, bit_string);
   break;
 case T_List:
   OUT_NODE(List, List, list, LIST, List, list);
@@ -24,6 +24,9 @@ case T_IntList:
 case T_OidList:
   OUT_NODE(OidList, OidList, oid_list, OID_LIST, List, oid_list);
   break;
+case T_A_Const:
+  OUT_NODE(A_Const, AConst, a__const, A_CONST, A_Const, a_const);
+  break;
 case T_Alias:
   OUT_NODE(Alias, Alias, alias, ALIAS, Alias, alias);
   break;
@@ -33,9 +36,6 @@ case T_RangeVar:
 case T_TableFunc:
   OUT_NODE(TableFunc, TableFunc, table_func, TABLE_FUNC, TableFunc, table_func);
   break;
-case T_Expr:
-  OUT_NODE(Expr, Expr, expr, EXPR, Expr, expr);
-  break;
 case T_Var:
   OUT_NODE(Var, Var, var, VAR, Var, var);
   break;
@@ -177,6 +177,9 @@ case T_OnConflictExpr:
 case T_IntoClause:
   OUT_NODE(IntoClause, IntoClause, into_clause, INTO_CLAUSE, IntoClause, into_clause);
   break;
+case T_MergeAction:
+  OUT_NODE(MergeAction, MergeAction, merge_action, MERGE_ACTION, MergeAction, merge_action);
+  break;
 case T_RawStmt:
   OUT_NODE(RawStmt, RawStmt, raw_stmt, RAW_STMT, RawStmt, raw_stmt);
   break;
@@ -192,9 +195,18 @@ case T_DeleteStmt:
 case T_UpdateStmt:
   OUT_NODE(UpdateStmt, UpdateStmt, update_stmt, UPDATE_STMT, UpdateStmt, update_stmt);
   break;
+case T_MergeStmt:
+  OUT_NODE(MergeStmt, MergeStmt, merge_stmt, MERGE_STMT, MergeStmt, merge_stmt);
+  break;
 case T_SelectStmt:
   OUT_NODE(SelectStmt, SelectStmt, select_stmt, SELECT_STMT, SelectStmt, select_stmt);
   break;
+case T_ReturnStmt:
+  OUT_NODE(ReturnStmt, ReturnStmt, return_stmt, RETURN_STMT, ReturnStmt, return_stmt);
+  break;
+case T_PLAssignStmt:
+  OUT_NODE(PLAssignStmt, PLAssignStmt, plassign_stmt, PLASSIGN_STMT, PLAssignStmt, plassign_stmt);
+  break;
 case T_AlterTableStmt:
   OUT_NODE(AlterTableStmt, AlterTableStmt, alter_table_stmt, ALTER_TABLE_STMT, AlterTableStmt, alter_table_stmt);
   break;
@@ -345,6 +357,9 @@ case T_CreateSchemaStmt:
 case T_AlterDatabaseStmt:
   OUT_NODE(AlterDatabaseStmt, AlterDatabaseStmt, alter_database_stmt, ALTER_DATABASE_STMT, AlterDatabaseStmt, alter_database_stmt);
   break;
+case T_AlterDatabaseRefreshCollStmt:
+  OUT_NODE(AlterDatabaseRefreshCollStmt, AlterDatabaseRefreshCollStmt, alter_database_refresh_coll_stmt, ALTER_DATABASE_REFRESH_COLL_STMT, AlterDatabaseRefreshCollStmt, alter_database_refresh_coll_stmt);
+  break;
 case T_AlterDatabaseSetStmt:
   OUT_NODE(AlterDatabaseSetStmt, AlterDatabaseSetStmt, alter_database_set_stmt, ALTER_DATABASE_SET_STMT, AlterDatabaseSetStmt, alter_database_set_stmt);
   break;
@@ -531,9 +546,6 @@ case T_ColumnRef:
 case T_ParamRef:
   OUT_NODE(ParamRef, ParamRef, param_ref, PARAM_REF, ParamRef, param_ref);
   break;
-case T_A_Const:
-  OUT_NODE(A_Const, AConst, a__const, A_CONST, A_Const, a_const);
-  break;
 case T_FuncCall:
   OUT_NODE(FuncCall, FuncCall, func_call, FUNC_CALL, FuncCall, func_call);
   break;
@@ -591,6 +603,9 @@ case T_ColumnDef:
 case T_IndexElem:
   OUT_NODE(IndexElem, IndexElem, index_elem, INDEX_ELEM, IndexElem, index_elem);
   break;
+case T_StatsElem:
+  OUT_NODE(StatsElem, StatsElem, stats_elem, STATS_ELEM, StatsElem, stats_elem);
+  break;
 case T_Constraint:
   OUT_NODE(Constraint, Constraint, constraint, CONSTRAINT, Constraint, constraint);
   break;
@@ -651,9 +666,18 @@ case T_InferClause:
 case T_OnConflictClause:
   OUT_NODE(OnConflictClause, OnConflictClause, on_conflict_clause, ON_CONFLICT_CLAUSE, OnConflictClause, on_conflict_clause);
   break;
+case T_CTESearchClause:
+  OUT_NODE(CTESearchClause, CTESearchClause, ctesearch_clause, CTESEARCH_CLAUSE, CTESearchClause, ctesearch_clause);
+  break;
+case T_CTECycleClause:
+  OUT_NODE(CTECycleClause, CTECycleClause, ctecycle_clause, CTECYCLE_CLAUSE, CTECycleClause, ctecycle_clause);
+  break;
 case T_CommonTableExpr:
   OUT_NODE(CommonTableExpr, CommonTableExpr, common_table_expr, COMMON_TABLE_EXPR, CommonTableExpr, common_table_expr);
   break;
+case T_MergeWhenClause:
+  OUT_NODE(MergeWhenClause, MergeWhenClause, merge_when_clause, MERGE_WHEN_CLAUSE, MergeWhenClause, merge_when_clause);
+  break;
 case T_RoleSpec:
   OUT_NODE(RoleSpec, RoleSpec, role_spec, ROLE_SPEC, RoleSpec, role_spec);
   break;
@@ -678,6 +702,12 @@ case T_PartitionCmd:
 case T_VacuumRelation:
   OUT_NODE(VacuumRelation, VacuumRelation, vacuum_relation, VACUUM_RELATION, VacuumRelation, vacuum_relation);
   break;
+case T_PublicationObjSpec:
+  OUT_NODE(PublicationObjSpec, PublicationObjSpec, publication_obj_spec, PUBLICATION_OBJ_SPEC, PublicationObjSpec, publication_obj_spec);
+  break;
+case T_PublicationTable:
+  OUT_NODE(PublicationTable, PublicationTable, publication_table, PUBLICATION_TABLE, PublicationTable, publication_table);
+  break;
 case T_InlineCodeBlock:
   OUT_NODE(InlineCodeBlock, InlineCodeBlock, inline_code_block, INLINE_CODE_BLOCK, InlineCodeBlock, inline_code_block);
   break;

data/ext/pg_query/include/pg_query_outfuncs_defs.c

@@ -3,7 +3,6 @@
 static void _outAlias(OUT_TYPE(Alias, Alias) out_node, const Alias *node);
 static void _outRangeVar(OUT_TYPE(RangeVar, RangeVar) out_node, const RangeVar *node);
 static void _outTableFunc(OUT_TYPE(TableFunc, TableFunc) out_node, const TableFunc *node);
-static void _outExpr(OUT_TYPE(Expr, Expr) out_node, const Expr *node);
 static void _outVar(OUT_TYPE(Var, Var) out_node, const Var *node);
 static void _outParam(OUT_TYPE(Param, Param) out_node, const Param *node);
 static void _outAggref(OUT_TYPE(Aggref, Aggref) out_node, const Aggref *node);
@@ -51,12 +50,16 @@ static void _outJoinExpr(OUT_TYPE(JoinExpr, JoinExpr) out_node, const JoinExpr *
 static void _outFromExpr(OUT_TYPE(FromExpr, FromExpr) out_node, const FromExpr *node);
 static void _outOnConflictExpr(OUT_TYPE(OnConflictExpr, OnConflictExpr) out_node, const OnConflictExpr *node);
 static void _outIntoClause(OUT_TYPE(IntoClause, IntoClause) out_node, const IntoClause *node);
+static void _outMergeAction(OUT_TYPE(MergeAction, MergeAction) out_node, const MergeAction *node);
 static void _outRawStmt(OUT_TYPE(RawStmt, RawStmt) out_node, const RawStmt *node);
 static void _outQuery(OUT_TYPE(Query, Query) out_node, const Query *node);
 static void _outInsertStmt(OUT_TYPE(InsertStmt, InsertStmt) out_node, const InsertStmt *node);
 static void _outDeleteStmt(OUT_TYPE(DeleteStmt, DeleteStmt) out_node, const DeleteStmt *node);
 static void _outUpdateStmt(OUT_TYPE(UpdateStmt, UpdateStmt) out_node, const UpdateStmt *node);
+static void _outMergeStmt(OUT_TYPE(MergeStmt, MergeStmt) out_node, const MergeStmt *node);
 static void _outSelectStmt(OUT_TYPE(SelectStmt, SelectStmt) out_node, const SelectStmt *node);
+static void _outReturnStmt(OUT_TYPE(ReturnStmt, ReturnStmt) out_node, const ReturnStmt *node);
+static void _outPLAssignStmt(OUT_TYPE(PLAssignStmt, PLAssignStmt) out_node, const PLAssignStmt *node);
 static void _outAlterTableStmt(OUT_TYPE(AlterTableStmt, AlterTableStmt) out_node, const AlterTableStmt *node);
 static void _outAlterTableCmd(OUT_TYPE(AlterTableCmd, AlterTableCmd) out_node, const AlterTableCmd *node);
 static void _outAlterDomainStmt(OUT_TYPE(AlterDomainStmt, AlterDomainStmt) out_node, const AlterDomainStmt *node);
@@ -107,6 +110,7 @@ static void _outReindexStmt(OUT_TYPE(ReindexStmt, ReindexStmt) out_node, const R
 static void _outCheckPointStmt(OUT_TYPE(CheckPointStmt, CheckPointStmt) out_node, const CheckPointStmt *node);
 static void _outCreateSchemaStmt(OUT_TYPE(CreateSchemaStmt, CreateSchemaStmt) out_node, const CreateSchemaStmt *node);
 static void _outAlterDatabaseStmt(OUT_TYPE(AlterDatabaseStmt, AlterDatabaseStmt) out_node, const AlterDatabaseStmt *node);
+static void _outAlterDatabaseRefreshCollStmt(OUT_TYPE(AlterDatabaseRefreshCollStmt, AlterDatabaseRefreshCollStmt) out_node, const AlterDatabaseRefreshCollStmt *node);
 static void _outAlterDatabaseSetStmt(OUT_TYPE(AlterDatabaseSetStmt, AlterDatabaseSetStmt) out_node, const AlterDatabaseSetStmt *node);
 static void _outAlterRoleSetStmt(OUT_TYPE(AlterRoleSetStmt, AlterRoleSetStmt) out_node, const AlterRoleSetStmt *node);
 static void _outCreateConversionStmt(OUT_TYPE(CreateConversionStmt, CreateConversionStmt) out_node, const CreateConversionStmt *node);
@@ -169,7 +173,6 @@ static void _outAlterStatsStmt(OUT_TYPE(AlterStatsStmt, AlterStatsStmt) out_node
 static void _outAExpr(OUT_TYPE(A_Expr, AExpr) out_node, const A_Expr *node);
 static void _outColumnRef(OUT_TYPE(ColumnRef, ColumnRef) out_node, const ColumnRef *node);
 static void _outParamRef(OUT_TYPE(ParamRef, ParamRef) out_node, const ParamRef *node);
-static void _outAConst(OUT_TYPE(A_Const, AConst) out_node, const A_Const *node);
 static void _outFuncCall(OUT_TYPE(FuncCall, FuncCall) out_node, const FuncCall *node);
 static void _outAStar(OUT_TYPE(A_Star, AStar) out_node, const A_Star *node);
 static void _outAIndices(OUT_TYPE(A_Indices, AIndices) out_node, const A_Indices *node);
@@ -189,6 +192,7 @@ static void _outRangeTableFuncCol(OUT_TYPE(RangeTableFuncCol, RangeTableFuncCol)
 static void _outTypeName(OUT_TYPE(TypeName, TypeName) out_node, const TypeName *node);
 static void _outColumnDef(OUT_TYPE(ColumnDef, ColumnDef) out_node, const ColumnDef *node);
 static void _outIndexElem(OUT_TYPE(IndexElem, IndexElem) out_node, const IndexElem *node);
+static void _outStatsElem(OUT_TYPE(StatsElem, StatsElem) out_node, const StatsElem *node);
 static void _outConstraint(OUT_TYPE(Constraint, Constraint) out_node, const Constraint *node);
 static void _outDefElem(OUT_TYPE(DefElem, DefElem) out_node, const DefElem *node);
 static void _outRangeTblEntry(OUT_TYPE(RangeTblEntry, RangeTblEntry) out_node, const RangeTblEntry *node);
@@ -209,7 +213,10 @@ static void _outXmlSerialize(OUT_TYPE(XmlSerialize, XmlSerialize) out_node, cons
 static void _outWithClause(OUT_TYPE(WithClause, WithClause) out_node, const WithClause *node);
 static void _outInferClause(OUT_TYPE(InferClause, InferClause) out_node, const InferClause *node);
 static void _outOnConflictClause(OUT_TYPE(OnConflictClause, OnConflictClause) out_node, const OnConflictClause *node);
+static void _outCTESearchClause(OUT_TYPE(CTESearchClause, CTESearchClause) out_node, const CTESearchClause *node);
+static void _outCTECycleClause(OUT_TYPE(CTECycleClause, CTECycleClause) out_node, const CTECycleClause *node);
 static void _outCommonTableExpr(OUT_TYPE(CommonTableExpr, CommonTableExpr) out_node, const CommonTableExpr *node);
+static void _outMergeWhenClause(OUT_TYPE(MergeWhenClause, MergeWhenClause) out_node, const MergeWhenClause *node);
 static void _outRoleSpec(OUT_TYPE(RoleSpec, RoleSpec) out_node, const RoleSpec *node);
 static void _outTriggerTransition(OUT_TYPE(TriggerTransition, TriggerTransition) out_node, const TriggerTransition *node);
 static void _outPartitionElem(OUT_TYPE(PartitionElem, PartitionElem) out_node, const PartitionElem *node);
@@ -218,6 +225,8 @@ static void _outPartitionBoundSpec(OUT_TYPE(PartitionBoundSpec, PartitionBoundSp
 static void _outPartitionRangeDatum(OUT_TYPE(PartitionRangeDatum, PartitionRangeDatum) out_node, const PartitionRangeDatum *node);
 static void _outPartitionCmd(OUT_TYPE(PartitionCmd, PartitionCmd) out_node, const PartitionCmd *node);
 static void _outVacuumRelation(OUT_TYPE(VacuumRelation, VacuumRelation) out_node, const VacuumRelation *node);
+static void _outPublicationObjSpec(OUT_TYPE(PublicationObjSpec, PublicationObjSpec) out_node, const PublicationObjSpec *node);
+static void _outPublicationTable(OUT_TYPE(PublicationTable, PublicationTable) out_node, const PublicationTable *node);
 static void _outInlineCodeBlock(OUT_TYPE(InlineCodeBlock, InlineCodeBlock) out_node, const InlineCodeBlock *node);
 static void _outCallContext(OUT_TYPE(CallContext, CallContext) out_node, const CallContext *node);
 
@@ -259,15 +268,10 @@ _outTableFunc(OUT_TYPE(TableFunc, TableFunc) out, const TableFunc *node)
   WRITE_INT_FIELD(location, location, location);
 }
 
-static void
-_outExpr(OUT_TYPE(Expr, Expr) out, const Expr *node)
-{
-}
-
 static void
 _outVar(OUT_TYPE(Var, Var) out, const Var *node)
 {
-  WRITE_UINT_FIELD(varno, varno, varno);
+  WRITE_INT_FIELD(varno, varno, varno);
   WRITE_INT_FIELD(varattno, varattno, varattno);
   WRITE_UINT_FIELD(vartype, vartype, vartype);
   WRITE_INT_FIELD(vartypmod, vartypmod, vartypmod);
@@ -308,6 +312,8 @@ _outAggref(OUT_TYPE(Aggref, Aggref) out, const Aggref *node)
   WRITE_CHAR_FIELD(aggkind, aggkind, aggkind);
   WRITE_UINT_FIELD(agglevelsup, agglevelsup, agglevelsup);
   WRITE_ENUM_FIELD(AggSplit, aggsplit, aggsplit, aggsplit);
+  WRITE_INT_FIELD(aggno, aggno, aggno);
+  WRITE_INT_FIELD(aggtransno, aggtransno, aggtransno);
   WRITE_INT_FIELD(location, location, location);
 }
 
@@ -341,6 +347,7 @@ _outSubscriptingRef(OUT_TYPE(SubscriptingRef, SubscriptingRef) out, const Subscr
 {
   WRITE_UINT_FIELD(refcontainertype, refcontainertype, refcontainertype);
   WRITE_UINT_FIELD(refelemtype, refelemtype, refelemtype);
+  WRITE_UINT_FIELD(refrestype, refrestype, refrestype);
   WRITE_INT_FIELD(reftypmod, reftypmod, reftypmod);
   WRITE_UINT_FIELD(refcollid, refcollid, refcollid);
   WRITE_LIST_FIELD(refupperindexpr, refupperindexpr, refupperindexpr);
@@ -416,6 +423,8 @@ _outScalarArrayOpExpr(OUT_TYPE(ScalarArrayOpExpr, ScalarArrayOpExpr) out, const
 {
   WRITE_UINT_FIELD(opno, opno, opno);
   WRITE_UINT_FIELD(opfuncid, opfuncid, opfuncid);
+  WRITE_UINT_FIELD(hashfuncid, hashfuncid, hashfuncid);
+  WRITE_UINT_FIELD(negfuncid, negfuncid, negfuncid);
   WRITE_BOOL_FIELD(use_or, useOr, useOr);
   WRITE_UINT_FIELD(inputcollid, inputcollid, inputcollid);
   WRITE_LIST_FIELD(args, args, args);
@@ -734,6 +743,7 @@ _outJoinExpr(OUT_TYPE(JoinExpr, JoinExpr) out, const JoinExpr *node)
   WRITE_NODE_PTR_FIELD(larg, larg, larg);
   WRITE_NODE_PTR_FIELD(rarg, rarg, rarg);
   WRITE_LIST_FIELD(using_clause, usingClause, usingClause);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(Alias, alias, join_using_alias, join_using_alias, join_using_alias);
   WRITE_NODE_PTR_FIELD(quals, quals, quals);
   WRITE_SPECIFIC_NODE_PTR_FIELD(Alias, alias, alias, alias, alias);
   WRITE_INT_FIELD(rtindex, rtindex, rtindex);
@@ -772,6 +782,17 @@ _outIntoClause(OUT_TYPE(IntoClause, IntoClause) out, const IntoClause *node)
   WRITE_BOOL_FIELD(skip_data, skipData, skipData);
 }
 
+static void
+_outMergeAction(OUT_TYPE(MergeAction, MergeAction) out, const MergeAction *node)
+{
+  WRITE_BOOL_FIELD(matched, matched, matched);
+  WRITE_ENUM_FIELD(CmdType, command_type, commandType, commandType);
+  WRITE_ENUM_FIELD(OverridingKind, override, override, override);
+  WRITE_NODE_PTR_FIELD(qual, qual, qual);
+  WRITE_LIST_FIELD(target_list, targetList, targetList);
+  WRITE_LIST_FIELD(update_colnos, updateColnos, updateColnos);
+}
+
 static void
 _outRawStmt(OUT_TYPE(RawStmt, RawStmt) out, const RawStmt *node)
 {
@@ -797,14 +818,18 @@ _outQuery(OUT_TYPE(Query, Query) out, const Query *node)
   WRITE_BOOL_FIELD(has_modifying_cte, hasModifyingCTE, hasModifyingCTE);
   WRITE_BOOL_FIELD(has_for_update, hasForUpdate, hasForUpdate);
   WRITE_BOOL_FIELD(has_row_security, hasRowSecurity, hasRowSecurity);
+  WRITE_BOOL_FIELD(is_return, isReturn, isReturn);
   WRITE_LIST_FIELD(cte_list, cteList, cteList);
   WRITE_LIST_FIELD(rtable, rtable, rtable);
   WRITE_SPECIFIC_NODE_PTR_FIELD(FromExpr, from_expr, jointree, jointree, jointree);
+  WRITE_LIST_FIELD(merge_action_list, mergeActionList, mergeActionList);
+  WRITE_BOOL_FIELD(merge_use_outer_join, mergeUseOuterJoin, mergeUseOuterJoin);
   WRITE_LIST_FIELD(target_list, targetList, targetList);
   WRITE_ENUM_FIELD(OverridingKind, override, override, override);
   WRITE_SPECIFIC_NODE_PTR_FIELD(OnConflictExpr, on_conflict_expr, on_conflict, onConflict, onConflict);
   WRITE_LIST_FIELD(returning_list, returningList, returningList);
   WRITE_LIST_FIELD(group_clause, groupClause, groupClause);
+  WRITE_BOOL_FIELD(group_distinct, groupDistinct, groupDistinct);
   WRITE_LIST_FIELD(grouping_sets, groupingSets, groupingSets);
   WRITE_NODE_PTR_FIELD(having_qual, havingQual, havingQual);
   WRITE_LIST_FIELD(window_clause, windowClause, windowClause);
@@ -854,6 +879,16 @@ _outUpdateStmt(OUT_TYPE(UpdateStmt, UpdateStmt) out, const UpdateStmt *node)
   WRITE_SPECIFIC_NODE_PTR_FIELD(WithClause, with_clause, with_clause, withClause, withClause);
 }
 
+static void
+_outMergeStmt(OUT_TYPE(MergeStmt, MergeStmt) out, const MergeStmt *node)
+{
+  WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
+  WRITE_NODE_PTR_FIELD(source_relation, sourceRelation, sourceRelation);
+  WRITE_NODE_PTR_FIELD(join_condition, joinCondition, joinCondition);
+  WRITE_LIST_FIELD(merge_when_clauses, mergeWhenClauses, mergeWhenClauses);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(WithClause, with_clause, with_clause, withClause, withClause);
+}
+
 static void
 _outSelectStmt(OUT_TYPE(SelectStmt, SelectStmt) out, const SelectStmt *node)
 {
@@ -863,6 +898,7 @@ _outSelectStmt(OUT_TYPE(SelectStmt, SelectStmt) out, const SelectStmt *node)
   WRITE_LIST_FIELD(from_clause, fromClause, fromClause);
   WRITE_NODE_PTR_FIELD(where_clause, whereClause, whereClause);
   WRITE_LIST_FIELD(group_clause, groupClause, groupClause);
+  WRITE_BOOL_FIELD(group_distinct, groupDistinct, groupDistinct);
   WRITE_NODE_PTR_FIELD(having_clause, havingClause, havingClause);
   WRITE_LIST_FIELD(window_clause, windowClause, windowClause);
   WRITE_LIST_FIELD(values_lists, valuesLists, valuesLists);
@@ -878,12 +914,28 @@ _outSelectStmt(OUT_TYPE(SelectStmt, SelectStmt) out, const SelectStmt *node)
   WRITE_SPECIFIC_NODE_PTR_FIELD(SelectStmt, select_stmt, rarg, rarg, rarg);
 }
 
+static void
+_outReturnStmt(OUT_TYPE(ReturnStmt, ReturnStmt) out, const ReturnStmt *node)
+{
+  WRITE_NODE_PTR_FIELD(returnval, returnval, returnval);
+}
+
+static void
+_outPLAssignStmt(OUT_TYPE(PLAssignStmt, PLAssignStmt) out, const PLAssignStmt *node)
+{
+  WRITE_STRING_FIELD(name, name, name);
+  WRITE_LIST_FIELD(indirection, indirection, indirection);
+  WRITE_INT_FIELD(nnames, nnames, nnames);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(SelectStmt, select_stmt, val, val, val);
+  WRITE_INT_FIELD(location, location, location);
+}
+
 static void
 _outAlterTableStmt(OUT_TYPE(AlterTableStmt, AlterTableStmt) out, const AlterTableStmt *node)
 {
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_LIST_FIELD(cmds, cmds, cmds);
-  WRITE_ENUM_FIELD(ObjectType, relkind, relkind, relkind);
+  WRITE_ENUM_FIELD(ObjectType, objtype, objtype, objtype);
   WRITE_BOOL_FIELD(missing_ok, missing_ok, missing_ok);
 }
 
@@ -934,6 +986,7 @@ _outGrantStmt(OUT_TYPE(GrantStmt, GrantStmt) out, const GrantStmt *node)
   WRITE_LIST_FIELD(privileges, privileges, privileges);
   WRITE_LIST_FIELD(grantees, grantees, grantees);
   WRITE_BOOL_FIELD(grant_option, grant_option, grant_option);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(RoleSpec, role_spec, grantor, grantor, grantor);
   WRITE_ENUM_FIELD(DropBehavior, behavior, behavior, behavior);
 }
 
@@ -966,7 +1019,7 @@ _outClusterStmt(OUT_TYPE(ClusterStmt, ClusterStmt) out, const ClusterStmt *node)
 {
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_STRING_FIELD(indexname, indexname, indexname);
-  WRITE_INT_FIELD(options, options, options);
+  WRITE_LIST_FIELD(params, params, params);
 }
 
 static void
@@ -1064,6 +1117,7 @@ _outIndexStmt(OUT_TYPE(IndexStmt, IndexStmt) out, const IndexStmt *node)
   WRITE_UINT_FIELD(old_create_subid, oldCreateSubid, oldCreateSubid);
   WRITE_UINT_FIELD(old_first_relfilenode_subid, oldFirstRelfilenodeSubid, oldFirstRelfilenodeSubid);
   WRITE_BOOL_FIELD(unique, unique, unique);
+  WRITE_BOOL_FIELD(nulls_not_distinct, nulls_not_distinct, nulls_not_distinct);
   WRITE_BOOL_FIELD(primary, primary, primary);
   WRITE_BOOL_FIELD(isconstraint, isconstraint, isconstraint);
   WRITE_BOOL_FIELD(deferrable, deferrable, deferrable);
@@ -1083,6 +1137,7 @@ _outCreateFunctionStmt(OUT_TYPE(CreateFunctionStmt, CreateFunctionStmt) out, con
   WRITE_LIST_FIELD(parameters, parameters, parameters);
   WRITE_SPECIFIC_NODE_PTR_FIELD(TypeName, type_name, return_type, returnType, returnType);
   WRITE_LIST_FIELD(options, options, options);
+  WRITE_NODE_PTR_FIELD(sql_body, sql_body, sql_body);
 }
 
 static void
@@ -1214,7 +1269,7 @@ _outCreateTableAsStmt(OUT_TYPE(CreateTableAsStmt, CreateTableAsStmt) out, const
 {
   WRITE_NODE_PTR_FIELD(query, query, query);
   WRITE_SPECIFIC_NODE_PTR_FIELD(IntoClause, into_clause, into, into, into);
-  WRITE_ENUM_FIELD(ObjectType, relkind, relkind, relkind);
+  WRITE_ENUM_FIELD(ObjectType, objtype, objtype, objtype);
   WRITE_BOOL_FIELD(is_select_into, is_select_into, is_select_into);
   WRITE_BOOL_FIELD(if_not_exists, if_not_exists, if_not_exists);
 }
@@ -1262,6 +1317,8 @@ _outDiscardStmt(OUT_TYPE(DiscardStmt, DiscardStmt) out, const DiscardStmt *node)
 static void
 _outCreateTrigStmt(OUT_TYPE(CreateTrigStmt, CreateTrigStmt) out, const CreateTrigStmt *node)
 {
+  WRITE_BOOL_FIELD(replace, replace, replace);
+  WRITE_BOOL_FIELD(isconstraint, isconstraint, isconstraint);
   WRITE_STRING_FIELD(trigname, trigname, trigname);
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_LIST_FIELD(funcname, funcname, funcname);
@@ -1271,7 +1328,6 @@ _outCreateTrigStmt(OUT_TYPE(CreateTrigStmt, CreateTrigStmt) out, const CreateTri
   WRITE_INT_FIELD(events, events, events);
   WRITE_LIST_FIELD(columns, columns, columns);
   WRITE_NODE_PTR_FIELD(when_clause, whenClause, whenClause);
-  WRITE_BOOL_FIELD(isconstraint, isconstraint, isconstraint);
   WRITE_LIST_FIELD(transition_rels, transitionRels, transitionRels);
   WRITE_BOOL_FIELD(deferrable, deferrable, deferrable);
   WRITE_BOOL_FIELD(initdeferred, initdeferred, initdeferred);
@@ -1333,8 +1389,7 @@ _outReindexStmt(OUT_TYPE(ReindexStmt, ReindexStmt) out, const ReindexStmt *node)
   WRITE_ENUM_FIELD(ReindexObjectType, kind, kind, kind);
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_STRING_FIELD(name, name, name);
-  WRITE_INT_FIELD(options, options, options);
-  WRITE_BOOL_FIELD(concurrent, concurrent, concurrent);
+  WRITE_LIST_FIELD(params, params, params);
 }
 
 static void
@@ -1358,6 +1413,12 @@ _outAlterDatabaseStmt(OUT_TYPE(AlterDatabaseStmt, AlterDatabaseStmt) out, const
   WRITE_LIST_FIELD(options, options, options);
 }
 
+static void
+_outAlterDatabaseRefreshCollStmt(OUT_TYPE(AlterDatabaseRefreshCollStmt, AlterDatabaseRefreshCollStmt) out, const AlterDatabaseRefreshCollStmt *node)
+{
+  WRITE_STRING_FIELD(dbname, dbname, dbname);
+}
+
 static void
 _outAlterDatabaseSetStmt(OUT_TYPE(AlterDatabaseSetStmt, AlterDatabaseSetStmt) out, const AlterDatabaseSetStmt *node)
 {
@@ -1471,7 +1532,7 @@ _outAlterObjectDependsStmt(OUT_TYPE(AlterObjectDependsStmt, AlterObjectDependsSt
   WRITE_ENUM_FIELD(ObjectType, object_type, objectType, objectType);
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_NODE_PTR_FIELD(object, object, object);
-  WRITE_NODE_PTR_FIELD(extname, extname, extname);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(String, string, extname, extname, extname);
   WRITE_BOOL_FIELD(remove, remove, remove);
 }
 
@@ -1786,7 +1847,7 @@ _outCreatePublicationStmt(OUT_TYPE(CreatePublicationStmt, CreatePublicationStmt)
 {
   WRITE_STRING_FIELD(pubname, pubname, pubname);
   WRITE_LIST_FIELD(options, options, options);
-  WRITE_LIST_FIELD(tables, tables, tables);
+  WRITE_LIST_FIELD(pubobjects, pubobjects, pubobjects);
   WRITE_BOOL_FIELD(for_all_tables, for_all_tables, for_all_tables);
 }
 
@@ -1795,9 +1856,9 @@ _outAlterPublicationStmt(OUT_TYPE(AlterPublicationStmt, AlterPublicationStmt) ou
 {
   WRITE_STRING_FIELD(pubname, pubname, pubname);
   WRITE_LIST_FIELD(options, options, options);
-  WRITE_LIST_FIELD(tables, tables, tables);
+  WRITE_LIST_FIELD(pubobjects, pubobjects, pubobjects);
   WRITE_BOOL_FIELD(for_all_tables, for_all_tables, for_all_tables);
-  WRITE_ENUM_FIELD(DefElemAction, table_action, tableAction, tableAction);
+  WRITE_ENUM_FIELD(AlterPublicationAction, action, action, action);
 }
 
 static void
@@ -1835,6 +1896,7 @@ _outCreateStatsStmt(OUT_TYPE(CreateStatsStmt, CreateStatsStmt) out, const Create
   WRITE_LIST_FIELD(exprs, exprs, exprs);
   WRITE_LIST_FIELD(relations, relations, relations);
   WRITE_STRING_FIELD(stxcomment, stxcomment, stxcomment);
+  WRITE_BOOL_FIELD(transformed, transformed, transformed);
   WRITE_BOOL_FIELD(if_not_exists, if_not_exists, if_not_exists);
 }
 
@@ -1849,6 +1911,7 @@ _outCallStmt(OUT_TYPE(CallStmt, CallStmt) out, const CallStmt *node)
 {
   WRITE_SPECIFIC_NODE_PTR_FIELD(FuncCall, func_call, funccall, funccall, funccall);
   WRITE_SPECIFIC_NODE_PTR_FIELD(FuncExpr, func_expr, funcexpr, funcexpr, funcexpr);
+  WRITE_LIST_FIELD(outargs, outargs, outargs);
 }
 
 static void
@@ -1883,13 +1946,6 @@ _outParamRef(OUT_TYPE(ParamRef, ParamRef) out, const ParamRef *node)
   WRITE_INT_FIELD(location, location, location);
 }
 
-static void
-_outAConst(OUT_TYPE(A_Const, AConst) out, const A_Const *node)
-{
-  WRITE_NODE_FIELD(val, val, val);
-  WRITE_INT_FIELD(location, location, location);
-}
-
 static void
 _outFuncCall(OUT_TYPE(FuncCall, FuncCall) out, const FuncCall *node)
 {
@@ -1897,11 +1953,12 @@ _outFuncCall(OUT_TYPE(FuncCall, FuncCall) out, const FuncCall *node)
   WRITE_LIST_FIELD(args, args, args);
   WRITE_LIST_FIELD(agg_order, agg_order, agg_order);
   WRITE_NODE_PTR_FIELD(agg_filter, agg_filter, agg_filter);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(WindowDef, window_def, over, over, over);
   WRITE_BOOL_FIELD(agg_within_group, agg_within_group, agg_within_group);
   WRITE_BOOL_FIELD(agg_star, agg_star, agg_star);
   WRITE_BOOL_FIELD(agg_distinct, agg_distinct, agg_distinct);
   WRITE_BOOL_FIELD(func_variadic, func_variadic, func_variadic);
-  WRITE_SPECIFIC_NODE_PTR_FIELD(WindowDef, window_def, over, over, over);
+  WRITE_ENUM_FIELD(CoercionForm, funcformat, funcformat, funcformat);
   WRITE_INT_FIELD(location, location, location);
 }
 
@@ -2059,6 +2116,7 @@ _outColumnDef(OUT_TYPE(ColumnDef, ColumnDef) out, const ColumnDef *node)
 {
   WRITE_STRING_FIELD(colname, colname, colname);
   WRITE_SPECIFIC_NODE_PTR_FIELD(TypeName, type_name, type_name, typeName, typeName);
+  WRITE_STRING_FIELD(compression, compression, compression);
   WRITE_INT_FIELD(inhcount, inhcount, inhcount);
   WRITE_BOOL_FIELD(is_local, is_local, is_local);
   WRITE_BOOL_FIELD(is_not_null, is_not_null, is_not_null);
@@ -2089,6 +2147,13 @@ _outIndexElem(OUT_TYPE(IndexElem, IndexElem) out, const IndexElem *node)
   WRITE_ENUM_FIELD(SortByNulls, nulls_ordering, nulls_ordering, nulls_ordering);
 }
 
+static void
+_outStatsElem(OUT_TYPE(StatsElem, StatsElem) out, const StatsElem *node)
+{
+  WRITE_STRING_FIELD(name, name, name);
+  WRITE_NODE_PTR_FIELD(expr, expr, expr);
+}
+
 static void
 _outConstraint(OUT_TYPE(Constraint, Constraint) out, const Constraint *node)
 {
@@ -2101,6 +2166,7 @@ _outConstraint(OUT_TYPE(Constraint, Constraint) out, const Constraint *node)
   WRITE_NODE_PTR_FIELD(raw_expr, raw_expr, raw_expr);
   WRITE_STRING_FIELD(cooked_expr, cooked_expr, cooked_expr);
   WRITE_CHAR_FIELD(generated_when, generated_when, generated_when);
+  WRITE_BOOL_FIELD(nulls_not_distinct, nulls_not_distinct, nulls_not_distinct);
   WRITE_LIST_FIELD(keys, keys, keys);
   WRITE_LIST_FIELD(including, including, including);
   WRITE_LIST_FIELD(exclusions, exclusions, exclusions);
@@ -2116,6 +2182,7 @@ _outConstraint(OUT_TYPE(Constraint, Constraint) out, const Constraint *node)
   WRITE_CHAR_FIELD(fk_matchtype, fk_matchtype, fk_matchtype);
   WRITE_CHAR_FIELD(fk_upd_action, fk_upd_action, fk_upd_action);
   WRITE_CHAR_FIELD(fk_del_action, fk_del_action, fk_del_action);
+  WRITE_LIST_FIELD(fk_del_set_cols, fk_del_set_cols, fk_del_set_cols);
   WRITE_LIST_FIELD(old_conpfeqop, old_conpfeqop, old_conpfeqop);
   WRITE_UINT_FIELD(old_pktable_oid, old_pktable_oid, old_pktable_oid);
   WRITE_BOOL_FIELD(skip_validation, skip_validation, skip_validation);
@@ -2147,6 +2214,7 @@ _outRangeTblEntry(OUT_TYPE(RangeTblEntry, RangeTblEntry) out, const RangeTblEntr
   WRITE_LIST_FIELD(joinaliasvars, joinaliasvars, joinaliasvars);
   WRITE_LIST_FIELD(joinleftcols, joinleftcols, joinleftcols);
   WRITE_LIST_FIELD(joinrightcols, joinrightcols, joinrightcols);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(Alias, alias, join_using_alias, join_using_alias, join_using_alias);
   WRITE_LIST_FIELD(functions, functions, functions);
   WRITE_BOOL_FIELD(funcordinality, funcordinality, funcordinality);
   WRITE_SPECIFIC_NODE_PTR_FIELD(TableFunc, table_func, tablefunc, tablefunc, tablefunc);
@@ -2231,6 +2299,7 @@ _outWindowClause(OUT_TYPE(WindowClause, WindowClause) out, const WindowClause *n
   WRITE_INT_FIELD(frame_options, frameOptions, frameOptions);
   WRITE_NODE_PTR_FIELD(start_offset, startOffset, startOffset);
   WRITE_NODE_PTR_FIELD(end_offset, endOffset, endOffset);
+  WRITE_LIST_FIELD(run_condition, runCondition, runCondition);
   WRITE_UINT_FIELD(start_in_range_func, startInRangeFunc, startInRangeFunc);
   WRITE_UINT_FIELD(end_in_range_func, endInRangeFunc, endInRangeFunc);
   WRITE_UINT_FIELD(in_range_coll, inRangeColl, inRangeColl);
@@ -2245,6 +2314,7 @@ _outObjectWithArgs(OUT_TYPE(ObjectWithArgs, ObjectWithArgs) out, const ObjectWit
 {
   WRITE_LIST_FIELD(objname, objname, objname);
   WRITE_LIST_FIELD(objargs, objargs, objargs);
+  WRITE_LIST_FIELD(objfuncargs, objfuncargs, objfuncargs);
   WRITE_BOOL_FIELD(args_unspecified, args_unspecified, args_unspecified);
 }
 
@@ -2336,6 +2406,30 @@ _outOnConflictClause(OUT_TYPE(OnConflictClause, OnConflictClause) out, const OnC
   WRITE_INT_FIELD(location, location, location);
 }
 
+static void
+_outCTESearchClause(OUT_TYPE(CTESearchClause, CTESearchClause) out, const CTESearchClause *node)
+{
+  WRITE_LIST_FIELD(search_col_list, search_col_list, search_col_list);
+  WRITE_BOOL_FIELD(search_breadth_first, search_breadth_first, search_breadth_first);
+  WRITE_STRING_FIELD(search_seq_column, search_seq_column, search_seq_column);
+  WRITE_INT_FIELD(location, location, location);
+}
+
+static void
+_outCTECycleClause(OUT_TYPE(CTECycleClause, CTECycleClause) out, const CTECycleClause *node)
+{
+  WRITE_LIST_FIELD(cycle_col_list, cycle_col_list, cycle_col_list);
+  WRITE_STRING_FIELD(cycle_mark_column, cycle_mark_column, cycle_mark_column);
+  WRITE_NODE_PTR_FIELD(cycle_mark_value, cycle_mark_value, cycle_mark_value);
+  WRITE_NODE_PTR_FIELD(cycle_mark_default, cycle_mark_default, cycle_mark_default);
+  WRITE_STRING_FIELD(cycle_path_column, cycle_path_column, cycle_path_column);
+  WRITE_INT_FIELD(location, location, location);
+  WRITE_UINT_FIELD(cycle_mark_type, cycle_mark_type, cycle_mark_type);
+  WRITE_INT_FIELD(cycle_mark_typmod, cycle_mark_typmod, cycle_mark_typmod);
+  WRITE_UINT_FIELD(cycle_mark_collation, cycle_mark_collation, cycle_mark_collation);
+  WRITE_UINT_FIELD(cycle_mark_neop, cycle_mark_neop, cycle_mark_neop);
+}
+
 static void
 _outCommonTableExpr(OUT_TYPE(CommonTableExpr, CommonTableExpr) out, const CommonTableExpr *node)
 {
@@ -2343,6 +2437,8 @@ _outCommonTableExpr(OUT_TYPE(CommonTableExpr, CommonTableExpr) out, const Common
   WRITE_LIST_FIELD(aliascolnames, aliascolnames, aliascolnames);
   WRITE_ENUM_FIELD(CTEMaterialize, ctematerialized, ctematerialized, ctematerialized);
   WRITE_NODE_PTR_FIELD(ctequery, ctequery, ctequery);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(CTESearchClause, ctesearch_clause, search_clause, search_clause, search_clause);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(CTECycleClause, ctecycle_clause, cycle_clause, cycle_clause, cycle_clause);
   WRITE_INT_FIELD(location, location, location);
   WRITE_BOOL_FIELD(cterecursive, cterecursive, cterecursive);
   WRITE_INT_FIELD(cterefcount, cterefcount, cterefcount);
@@ -2352,6 +2448,17 @@ _outCommonTableExpr(OUT_TYPE(CommonTableExpr, CommonTableExpr) out, const Common
   WRITE_LIST_FIELD(ctecolcollations, ctecolcollations, ctecolcollations);
 }
 
+static void
+_outMergeWhenClause(OUT_TYPE(MergeWhenClause, MergeWhenClause) out, const MergeWhenClause *node)
+{
+  WRITE_BOOL_FIELD(matched, matched, matched);
+  WRITE_ENUM_FIELD(CmdType, command_type, commandType, commandType);
+  WRITE_ENUM_FIELD(OverridingKind, override, override, override);
+  WRITE_NODE_PTR_FIELD(condition, condition, condition);
+  WRITE_LIST_FIELD(target_list, targetList, targetList);
+  WRITE_LIST_FIELD(values, values, values);
+}
+
 static void
 _outRoleSpec(OUT_TYPE(RoleSpec, RoleSpec) out, const RoleSpec *node)
 {
@@ -2412,6 +2519,7 @@ _outPartitionCmd(OUT_TYPE(PartitionCmd, PartitionCmd) out, const PartitionCmd *n
 {
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, name, name, name);
   WRITE_SPECIFIC_NODE_PTR_FIELD(PartitionBoundSpec, partition_bound_spec, bound, bound, bound);
+  WRITE_BOOL_FIELD(concurrent, concurrent, concurrent);
 }
 
 static void
@@ -2422,6 +2530,23 @@ _outVacuumRelation(OUT_TYPE(VacuumRelation, VacuumRelation) out, const VacuumRel
   WRITE_LIST_FIELD(va_cols, va_cols, va_cols);
 }
 
+static void
+_outPublicationObjSpec(OUT_TYPE(PublicationObjSpec, PublicationObjSpec) out, const PublicationObjSpec *node)
+{
+  WRITE_ENUM_FIELD(PublicationObjSpecType, pubobjtype, pubobjtype, pubobjtype);
+  WRITE_STRING_FIELD(name, name, name);
+  WRITE_SPECIFIC_NODE_PTR_FIELD(PublicationTable, publication_table, pubtable, pubtable, pubtable);
+  WRITE_INT_FIELD(location, location, location);
+}
+
+static void
+_outPublicationTable(OUT_TYPE(PublicationTable, PublicationTable) out, const PublicationTable *node)
+{
+  WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
+  WRITE_NODE_PTR_FIELD(where_clause, whereClause, whereClause);
+  WRITE_LIST_FIELD(columns, columns, columns);
+}
+
 static void
 _outInlineCodeBlock(OUT_TYPE(InlineCodeBlock, InlineCodeBlock) out, const InlineCodeBlock *node)
 {