pg_query 2.0.3 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f19538f4d41c891a9b7704cd56becd762e44f5f766fba06c07f89b2e1d61b69f
-  data.tar.gz: df5a48fd5582bacd09098a5d37c21794a6f1caff82b16fe4597be2257bb0eaa1
+  metadata.gz: ede23ff0f5d9af4599a7732fe624b3e2fba355ebb54bb6b88df3ef3932d7692a
+  data.tar.gz: d11105ea7323b8908dde6b328908190858d150f12a13a109d943ae3bf8af475b
 SHA512:
-  metadata.gz: 0326c810f5589b03d3a1809e98c199984c6bc013dfd93228cb6e35e5378cf39421ff0690c5dc67431f4b1501815fa80245d5e0cfcb1c75186054aa5d1300d684
-  data.tar.gz: 476514b25750f97ab9f27c55ccf6c221b6ab16687677178adc9f2ed219a85286dca983a36b25e703a3f0e9f080268ce6e82b69fbb932d4e50195bc711f434530
+  metadata.gz: 37b3301df52b4743098ded9bbb69b05f4a360f7e1335386833ac619f4e5423f7b3c42a6506b3519c59ed3d0bb62e6e59ef04c8515fc9a3eb5daa95c53ab228e7
+  data.tar.gz: cd94026574593d6e78ac41e88c3378a6c46ea6d0869f8ddd9a200c367a969ff67695a780b0609518eafcff7a8dfaff015ce6408662eff7616cb866b46b52593a

data/CHANGELOG.md

@@ -5,6 +5,36 @@
 * ...
 
 
+## 2.1.0     2021-07-04
+
+* Update to libpg_query 13-2.0.6
+  - Update to Postgres 13.3 patch release
+  - Normalize: Don't touch "GROUP BY 1" and "ORDER BY 1" expressions, keep original text 
+  - Fingerprint: Cache list item hashes to fingerprint complex queries faster
+  - Deparser: Emit the RangeVar catalogname if present
+  - Fix crash in pg_scan function when encountering backslash escapes
+* Support extracting functions from a parsed query ([#147](https://github.com/pganalyze/pg_query/pull/147))
+  - Adds new `functions`, `ddl_functions` and `call_functions` methods
+  - Note that functions are identified by their name only, not their full type definition,
+    since raw query parsetrees don't contain sufficient data to identify the types of
+    arguments when functions are called
+* Relax google-protobuf dependency ([#213](https://github.com/pganalyze/pg_query/pull/213))
+* Update google-protobuf to 3.17.1 ([#212](https://github.com/pganalyze/pg_query/pull/212))
+  - google-protobuf 3.15.x has a bug that causes a seg fault in Ruby under
+    certain conditions (https://github.com/protocolbuffers/protobuf/pull/8639). Use
+    google-protobuf 3.17.1 instead.
+* Use Protobuf definition for determining JSON field names
+  - Note you may see a breaking change if you were using `PgQuery::ParseResult.encode_json`
+    to map the protobuf result to JSON, since this now respects the intended JSON names
+    from the Proto3 definition (instead of the differently formatted Protobuf field names)
+* Rakefile: Fix "rake clean" by using CLEAN.include instead of CLEAN.<<
+* Find tables inside COALESCE/MIN/MAX functions, UPDATE FROM list
+* Extconf: Add library include path using $INCFLAGS, list it first
+  - This ensures any system installed libpg_query gets considered after
+    the bundled libpg_query, avoiding errors where the wrong header files
+    are used.
+
+
 ## 2.0.3     2021-04-05
 
 * Update to libpg_query 13-2.0.4

data/README.md

@@ -133,6 +133,18 @@ PgQuery.fingerprint("SELECT ?")
 => "50fde20626009aba"
 ```
 
+### Scanning a query into tokens
+
+```ruby
+PgQuery.scan('SELECT 1 --comment')
+
+=> [<PgQuery::ScanResult: version: 130002, tokens: [
+<PgQuery::ScanToken: start: 0, end: 6, token: :SELECT, keyword_kind: :RESERVED_KEYWORD>,
+<PgQuery::ScanToken: start: 7, end: 8, token: :ICONST, keyword_kind: :NO_KEYWORD>,
+<PgQuery::ScanToken: start: 9, end: 18, token: :SQL_COMMENT, keyword_kind: :NO_KEYWORD>]>,
+ []]
+```
+
 ## Differences from Upstream PostgreSQL
 
 This gem is based on [libpg_query](https://github.com/pganalyze/libpg_query),

data/Rakefile

@@ -5,8 +5,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '13-2.0.4'.freeze
-LIB_PG_QUERY_SHA256SUM = 'a67ef3e3b6c9cb1297f362888d6660dac165d3b020f78d23afe4293b8ceaf190'.freeze
+LIB_PG_QUERY_TAG = '13-2.0.6'.freeze
+LIB_PG_QUERY_SHA256SUM = '61f384ac949bd7404efe6bcc37a8a6fca79030e59c02659f108ee1db45e93414'.freeze
 
 Rake::ExtensionTask.new 'pg_query' do |ext|
   ext.lib_dir = 'lib/pg_query'
@@ -21,9 +21,9 @@ task default: %i[spec lint]
 task test: :spec
 task lint: :rubocop
 
-CLEAN << 'tmp/**/*'
-CLEAN << 'ext/pg_query/*.o'
-CLEAN << 'lib/pg_query/pg_query.bundle'
+CLEAN.include 'tmp/**/*'
+CLEAN.include 'ext/pg_query/*.o'
+CLEAN.include 'lib/pg_query/pg_query.bundle'
 
 task :update_source do
   workdir = File.join(__dir__, 'tmp')
@@ -86,18 +86,4 @@ task :update_source do
   system("cp -a #{libdir}/testdata/* #{testfilesdir}")
   # Copy back the custom ext files
   system("cp -a #{extbakdir}/pg_query_ruby.{c,sym} #{extbakdir}/extconf.rb #{extdir}")
-
-  # Generate JSON field name helper (workaround until https://github.com/protocolbuffers/protobuf/pull/8356 is merged)
-  str = "module PgQuery\n  INTERNAL_PROTO_FIELD_NAME_TO_JSON_NAME = {\n"
-  cur_type = nil
-  File.read(File.join(libdir, 'protobuf/pg_query.proto')).each_line do |line|
-    if line[/^message (\w+)/]
-      cur_type = $1
-      next
-    end
-    next unless line[/(repeated )?\w+ (\w+) = \d+( \[json_name="(\w+)"\])?;/]
-    str += format("    [%s, :%s] => '%s',\n", cur_type, $2, $4 || $2)
-  end
-  str += "  }\nend\n"
-  File.write(File.join(__dir__, 'lib/pg_query/json_field_names.rb'), str)
 end

data/ext/pg_query/extconf.rb

@@ -7,7 +7,9 @@ require 'pathname'
 
 $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
 
-$CFLAGS << " -I#{File.join(__dir__, 'include')} -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
+$CFLAGS << " -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -g"
+
+$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
 
 SYMFILE = File.join(__dir__, 'pg_query_ruby.sym')
 if RUBY_PLATFORM =~ /darwin/

data/ext/pg_query/include/c.h

@@ -110,6 +110,18 @@
 #define pg_attribute_unused()
 #endif
 
+/*
+ * Place this macro before functions that should be allowed to make misaligned
+ * accesses.  Think twice before using it on non-x86-specific code!
+ * Testing can be done with "-fsanitize=alignment -fsanitize-trap=alignment"
+ * on clang, or "-fsanitize=alignment -fno-sanitize-recover=alignment" on gcc.
+ */
+#if __clang_major__ >= 7 || __GNUC__ >= 8
+#define pg_attribute_no_sanitize_alignment() __attribute__((no_sanitize("alignment")))
+#else
+#define pg_attribute_no_sanitize_alignment()
+#endif
+
 /*
  * Append PG_USED_FOR_ASSERTS_ONLY to definitions of variables that are only
  * used in assert-enabled builds, to avoid compiler warnings about unused

data/ext/pg_query/include/executor/executor.h

@@ -271,6 +271,12 @@ extern ProjectionInfo *ExecBuildProjectionInfo(List *targetList,
 											   TupleTableSlot *slot,
 											   PlanState *parent,
 											   TupleDesc inputDesc);
+extern ProjectionInfo *ExecBuildProjectionInfoExt(List *targetList,
+												  ExprContext *econtext,
+												  TupleTableSlot *slot,
+												  bool assignJunkEntries,
+												  PlanState *parent,
+												  TupleDesc inputDesc);
 extern ExprState *ExecPrepareExpr(Expr *node, EState *estate);
 extern ExprState *ExecPrepareQual(List *qual, EState *estate);
 extern ExprState *ExecPrepareCheck(List *qual, EState *estate);

data/ext/pg_query/include/nodes/execnodes.h

@@ -395,12 +395,15 @@ typedef struct OnConflictSetState
  * relation, and perhaps also fire triggers.  ResultRelInfo holds all the
  * information needed about a result relation, including indexes.
  *
- * Normally, a ResultRelInfo refers to a table that is in the query's
- * range table; then ri_RangeTableIndex is the RT index and ri_RelationDesc
- * is just a copy of the relevant es_relations[] entry.  But sometimes,
- * in ResultRelInfos used only for triggers, ri_RangeTableIndex is zero
- * and ri_RelationDesc is a separately-opened relcache pointer that needs
- * to be separately closed.  See ExecGetTriggerResultRel.
+ * Normally, a ResultRelInfo refers to a table that is in the query's range
+ * table; then ri_RangeTableIndex is the RT index and ri_RelationDesc is
+ * just a copy of the relevant es_relations[] entry.  However, in some
+ * situations we create ResultRelInfos for relations that are not in the
+ * range table, namely for targets of tuple routing in a partitioned table,
+ * and when firing triggers in tables other than the target tables (See
+ * ExecGetTriggerResultRel).  In these situations, ri_RangeTableIndex is 0
+ * and ri_RelationDesc is a separately-opened relcache pointer that needs to
+ * be separately closed.
  */
 typedef struct ResultRelInfo
 {

data/ext/pg_query/include/nodes/pathnodes.h

@@ -912,7 +912,7 @@ typedef struct StatisticExtInfo
 
 	Oid			statOid;		/* OID of the statistics row */
 	RelOptInfo *rel;			/* back-link to statistic's table */
-	char		kind;			/* statistic kind of this entry */
+	char		kind;			/* statistics kind of this entry */
 	Bitmapset  *keys;			/* attnums of the columns covered */
 } StatisticExtInfo;
 

data/ext/pg_query/include/optimizer/paths.h

@@ -135,6 +135,14 @@ extern EquivalenceClass *get_eclass_for_sort_expr(PlannerInfo *root,
 												  Index sortref,
 												  Relids rel,
 												  bool create_it);
+extern EquivalenceMember *find_ec_member_matching_expr(EquivalenceClass *ec,
+													   Expr *expr,
+													   Relids relids);
+extern EquivalenceMember *find_computable_ec_member(PlannerInfo *root,
+													EquivalenceClass *ec,
+													List *exprs,
+													Relids relids,
+													bool require_parallel_safe);
 extern Expr *find_em_expr_for_rel(EquivalenceClass *ec, RelOptInfo *rel);
 extern Expr *find_em_expr_usable_for_sorting_rel(PlannerInfo *root,
 												 EquivalenceClass *ec,

data/ext/pg_query/include/pg_config.h

@@ -757,7 +757,7 @@
 #define PACKAGE_NAME "PostgreSQL"
 
 /* Define to the full name and version of this package. */
-#define PACKAGE_STRING "PostgreSQL 13.2"
+#define PACKAGE_STRING "PostgreSQL 13.3"
 
 /* Define to the one symbol short name of this package. */
 #define PACKAGE_TARNAME "postgresql"
@@ -766,7 +766,7 @@
 #define PACKAGE_URL "https://www.postgresql.org/"
 
 /* Define to the version of this package. */
-#define PACKAGE_VERSION "13.2"
+#define PACKAGE_VERSION "13.3"
 
 /* Define to the name of a signed 128-bit integer type. */
 #define PG_INT128_TYPE __int128
@@ -785,7 +785,7 @@
 #define PG_MAJORVERSION_NUM 13
 
 /* PostgreSQL minor version number */
-#define PG_MINORVERSION_NUM 2
+#define PG_MINORVERSION_NUM 3
 
 /* Define to best printf format archetype, usually gnu_printf if available. */
 #define PG_PRINTF_ATTRIBUTE printf
@@ -794,13 +794,13 @@
 #define PG_USE_STDBOOL 1
 
 /* PostgreSQL version as a string */
-#define PG_VERSION "13.2"
+#define PG_VERSION "13.3"
 
 /* PostgreSQL version as a number */
-#define PG_VERSION_NUM 130002
+#define PG_VERSION_NUM 130003
 
 /* A string containing the version number, platform, and C compiler */
-#define PG_VERSION_STR "PostgreSQL 13.2 on x86_64-apple-darwin19.6.0, compiled by Apple clang version 12.0.0 (clang-1200.0.32.29), 64-bit"
+#define PG_VERSION_STR "PostgreSQL 13.3 on x86_64-apple-darwin19.6.0, compiled by Apple clang version 12.0.0 (clang-1200.0.32.29), 64-bit"
 
 /* Define to 1 to allow profiling output to be saved separately for each
    process. */

data/ext/pg_query/include/pg_config_manual.h

@@ -135,6 +135,13 @@
 #define EXEC_BACKEND
 #endif
 
+/*
+ * Define this if your operating system supports link()
+ */
+#if !defined(WIN32) && !defined(__CYGWIN__)
+#define HAVE_WORKING_LINK 1
+#endif
+
 /*
  * USE_POSIX_FADVISE controls whether Postgres will attempt to use the
  * posix_fadvise() kernel call.  Usually the automatic configure tests are

data/ext/pg_query/include/pg_query.h

@@ -106,9 +106,9 @@ void pg_query_free_fingerprint_result(PgQueryFingerprintResult result);
 void pg_query_exit(void);
 
 // Postgres version information
-#define PG_VERSION "13.2"
+#define PG_VERSION "13.3"
 #define PG_MAJORVERSION "13"
-#define PG_VERSION_NUM 130002
+#define PG_VERSION_NUM 130003
 
 // Deprecated APIs below
 

data/ext/pg_query/include/pg_query_outfuncs_defs.c

@@ -2270,6 +2270,7 @@ _outTableLikeClause(OUT_TYPE(TableLikeClause, TableLikeClause) out, const TableL
 {
   WRITE_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   WRITE_UINT_FIELD(options, options, options);
+  WRITE_UINT_FIELD(relation_oid, relationOid, relationOid);
 }
 
 static void

data/ext/pg_query/include/pg_query_readfuncs_defs.c

@@ -2674,6 +2674,7 @@ _readTableLikeClause(OUT_TYPE(TableLikeClause, TableLikeClause) msg)
   TableLikeClause *node = makeNode(TableLikeClause);
   READ_SPECIFIC_NODE_PTR_FIELD(RangeVar, range_var, relation, relation, relation);
   READ_UINT_FIELD(options, options, options);
+  READ_UINT_FIELD(relation_oid, relationOid, relationOid);
   return node;
 }
 

data/ext/pg_query/include/protobuf-c.h

@@ -238,7 +238,11 @@ PROTOBUF_C__BEGIN_DECLS
 #define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC       0x114315af
 
 /* Empty string used for initializers */
+#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
+static const char protobuf_c_empty_string[] = "";
+#else
 extern const char protobuf_c_empty_string[];
+#endif
 
 /**
  * \defgroup api Public API
@@ -790,13 +794,13 @@ protobuf_c_version_number(void);
  * The version of the protobuf-c headers, represented as a string using the same
  * format as protobuf_c_version().
  */
-#define PROTOBUF_C_VERSION		"1.3.3"
+#define PROTOBUF_C_VERSION		"1.4.0"
 
 /**
  * The version of the protobuf-c headers, represented as an integer using the
  * same format as protobuf_c_version_number().
  */
-#define PROTOBUF_C_VERSION_NUMBER	1003003
+#define PROTOBUF_C_VERSION_NUMBER	1004000
 
 /**
  * The minimum protoc-c version which works with the current version of the
@@ -1103,4 +1107,4 @@ protobuf_c_service_invoke_internal(
 
 PROTOBUF_C__END_DECLS
 
-#endif /* PROTOBUF_C_H */
+#endif /* PROTOBUF_C_H */

data/ext/pg_query/include/protobuf-c/protobuf-c.h

@@ -238,7 +238,11 @@ PROTOBUF_C__BEGIN_DECLS
 #define PROTOBUF_C__ENUM_DESCRIPTOR_MAGIC       0x114315af
 
 /* Empty string used for initializers */
+#if defined(_WIN32) && defined(PROTOBUF_C_USE_SHARED_LIB)
+static const char protobuf_c_empty_string[] = "";
+#else
 extern const char protobuf_c_empty_string[];
+#endif
 
 /**
  * \defgroup api Public API
@@ -790,13 +794,13 @@ protobuf_c_version_number(void);
  * The version of the protobuf-c headers, represented as a string using the same
  * format as protobuf_c_version().
  */
-#define PROTOBUF_C_VERSION		"1.3.3"
+#define PROTOBUF_C_VERSION		"1.4.0"
 
 /**
  * The version of the protobuf-c headers, represented as an integer using the
  * same format as protobuf_c_version_number().
  */
-#define PROTOBUF_C_VERSION_NUMBER	1003003
+#define PROTOBUF_C_VERSION_NUMBER	1004000
 
 /**
  * The minimum protoc-c version which works with the current version of the
@@ -1103,4 +1107,4 @@ protobuf_c_service_invoke_internal(
 
 PROTOBUF_C__END_DECLS
 
-#endif /* PROTOBUF_C_H */
+#endif /* PROTOBUF_C_H */

data/ext/pg_query/include/protobuf/pg_query.pb-c.h

@@ -10,243 +10,243 @@ PROTOBUF_C__BEGIN_DECLS
 
 #if PROTOBUF_C_VERSION_NUMBER < 1003000
 # error This file was generated by a newer version of protoc-c which is incompatible with your libprotobuf-c headers. Please update your headers.
-#elif 1003003 < PROTOBUF_C_MIN_COMPILER_VERSION
+#elif 1004000 < PROTOBUF_C_MIN_COMPILER_VERSION
 # error This file was generated by an older version of protoc-c which is incompatible with your libprotobuf-c headers. Please regenerate this file with a newer version of protoc-c.
 #endif
 
 
-typedef struct _PgQuery__ParseResult PgQuery__ParseResult;
-typedef struct _PgQuery__ScanResult PgQuery__ScanResult;
-typedef struct _PgQuery__Node PgQuery__Node;
-typedef struct _PgQuery__Integer PgQuery__Integer;
-typedef struct _PgQuery__Float PgQuery__Float;
-typedef struct _PgQuery__String PgQuery__String;
-typedef struct _PgQuery__BitString PgQuery__BitString;
-typedef struct _PgQuery__Null PgQuery__Null;
-typedef struct _PgQuery__List PgQuery__List;
-typedef struct _PgQuery__OidList PgQuery__OidList;
-typedef struct _PgQuery__IntList PgQuery__IntList;
-typedef struct _PgQuery__Alias PgQuery__Alias;
-typedef struct _PgQuery__RangeVar PgQuery__RangeVar;
-typedef struct _PgQuery__TableFunc PgQuery__TableFunc;
-typedef struct _PgQuery__Expr PgQuery__Expr;
-typedef struct _PgQuery__Var PgQuery__Var;
-typedef struct _PgQuery__Param PgQuery__Param;
-typedef struct _PgQuery__Aggref PgQuery__Aggref;
-typedef struct _PgQuery__GroupingFunc PgQuery__GroupingFunc;
-typedef struct _PgQuery__WindowFunc PgQuery__WindowFunc;
-typedef struct _PgQuery__SubscriptingRef PgQuery__SubscriptingRef;
-typedef struct _PgQuery__FuncExpr PgQuery__FuncExpr;
-typedef struct _PgQuery__NamedArgExpr PgQuery__NamedArgExpr;
-typedef struct _PgQuery__OpExpr PgQuery__OpExpr;
-typedef struct _PgQuery__DistinctExpr PgQuery__DistinctExpr;
-typedef struct _PgQuery__NullIfExpr PgQuery__NullIfExpr;
-typedef struct _PgQuery__ScalarArrayOpExpr PgQuery__ScalarArrayOpExpr;
-typedef struct _PgQuery__BoolExpr PgQuery__BoolExpr;
-typedef struct _PgQuery__SubLink PgQuery__SubLink;
-typedef struct _PgQuery__SubPlan PgQuery__SubPlan;
-typedef struct _PgQuery__AlternativeSubPlan PgQuery__AlternativeSubPlan;
-typedef struct _PgQuery__FieldSelect PgQuery__FieldSelect;
-typedef struct _PgQuery__FieldStore PgQuery__FieldStore;
-typedef struct _PgQuery__RelabelType PgQuery__RelabelType;
-typedef struct _PgQuery__CoerceViaIO PgQuery__CoerceViaIO;
-typedef struct _PgQuery__ArrayCoerceExpr PgQuery__ArrayCoerceExpr;
-typedef struct _PgQuery__ConvertRowtypeExpr PgQuery__ConvertRowtypeExpr;
-typedef struct _PgQuery__CollateExpr PgQuery__CollateExpr;
-typedef struct _PgQuery__CaseExpr PgQuery__CaseExpr;
-typedef struct _PgQuery__CaseWhen PgQuery__CaseWhen;
-typedef struct _PgQuery__CaseTestExpr PgQuery__CaseTestExpr;
-typedef struct _PgQuery__ArrayExpr PgQuery__ArrayExpr;
-typedef struct _PgQuery__RowExpr PgQuery__RowExpr;
-typedef struct _PgQuery__RowCompareExpr PgQuery__RowCompareExpr;
-typedef struct _PgQuery__CoalesceExpr PgQuery__CoalesceExpr;
-typedef struct _PgQuery__MinMaxExpr PgQuery__MinMaxExpr;
-typedef struct _PgQuery__SQLValueFunction PgQuery__SQLValueFunction;
-typedef struct _PgQuery__XmlExpr PgQuery__XmlExpr;
-typedef struct _PgQuery__NullTest PgQuery__NullTest;
-typedef struct _PgQuery__BooleanTest PgQuery__BooleanTest;
-typedef struct _PgQuery__CoerceToDomain PgQuery__CoerceToDomain;
-typedef struct _PgQuery__CoerceToDomainValue PgQuery__CoerceToDomainValue;
-typedef struct _PgQuery__SetToDefault PgQuery__SetToDefault;
-typedef struct _PgQuery__CurrentOfExpr PgQuery__CurrentOfExpr;
-typedef struct _PgQuery__NextValueExpr PgQuery__NextValueExpr;
-typedef struct _PgQuery__InferenceElem PgQuery__InferenceElem;
-typedef struct _PgQuery__TargetEntry PgQuery__TargetEntry;
-typedef struct _PgQuery__RangeTblRef PgQuery__RangeTblRef;
-typedef struct _PgQuery__JoinExpr PgQuery__JoinExpr;
-typedef struct _PgQuery__FromExpr PgQuery__FromExpr;
-typedef struct _PgQuery__OnConflictExpr PgQuery__OnConflictExpr;
-typedef struct _PgQuery__IntoClause PgQuery__IntoClause;
-typedef struct _PgQuery__RawStmt PgQuery__RawStmt;
-typedef struct _PgQuery__Query PgQuery__Query;
-typedef struct _PgQuery__InsertStmt PgQuery__InsertStmt;
-typedef struct _PgQuery__DeleteStmt PgQuery__DeleteStmt;
-typedef struct _PgQuery__UpdateStmt PgQuery__UpdateStmt;
-typedef struct _PgQuery__SelectStmt PgQuery__SelectStmt;
-typedef struct _PgQuery__AlterTableStmt PgQuery__AlterTableStmt;
-typedef struct _PgQuery__AlterTableCmd PgQuery__AlterTableCmd;
-typedef struct _PgQuery__AlterDomainStmt PgQuery__AlterDomainStmt;
-typedef struct _PgQuery__SetOperationStmt PgQuery__SetOperationStmt;
-typedef struct _PgQuery__GrantStmt PgQuery__GrantStmt;
-typedef struct _PgQuery__GrantRoleStmt PgQuery__GrantRoleStmt;
-typedef struct _PgQuery__AlterDefaultPrivilegesStmt PgQuery__AlterDefaultPrivilegesStmt;
-typedef struct _PgQuery__ClosePortalStmt PgQuery__ClosePortalStmt;
-typedef struct _PgQuery__ClusterStmt PgQuery__ClusterStmt;
-typedef struct _PgQuery__CopyStmt PgQuery__CopyStmt;
-typedef struct _PgQuery__CreateStmt PgQuery__CreateStmt;
-typedef struct _PgQuery__DefineStmt PgQuery__DefineStmt;
-typedef struct _PgQuery__DropStmt PgQuery__DropStmt;
-typedef struct _PgQuery__TruncateStmt PgQuery__TruncateStmt;
-typedef struct _PgQuery__CommentStmt PgQuery__CommentStmt;
-typedef struct _PgQuery__FetchStmt PgQuery__FetchStmt;
-typedef struct _PgQuery__IndexStmt PgQuery__IndexStmt;
-typedef struct _PgQuery__CreateFunctionStmt PgQuery__CreateFunctionStmt;
-typedef struct _PgQuery__AlterFunctionStmt PgQuery__AlterFunctionStmt;
-typedef struct _PgQuery__DoStmt PgQuery__DoStmt;
-typedef struct _PgQuery__RenameStmt PgQuery__RenameStmt;
-typedef struct _PgQuery__RuleStmt PgQuery__RuleStmt;
-typedef struct _PgQuery__NotifyStmt PgQuery__NotifyStmt;
-typedef struct _PgQuery__ListenStmt PgQuery__ListenStmt;
-typedef struct _PgQuery__UnlistenStmt PgQuery__UnlistenStmt;
-typedef struct _PgQuery__TransactionStmt PgQuery__TransactionStmt;
-typedef struct _PgQuery__ViewStmt PgQuery__ViewStmt;
-typedef struct _PgQuery__LoadStmt PgQuery__LoadStmt;
-typedef struct _PgQuery__CreateDomainStmt PgQuery__CreateDomainStmt;
-typedef struct _PgQuery__CreatedbStmt PgQuery__CreatedbStmt;
-typedef struct _PgQuery__DropdbStmt PgQuery__DropdbStmt;
-typedef struct _PgQuery__VacuumStmt PgQuery__VacuumStmt;
-typedef struct _PgQuery__ExplainStmt PgQuery__ExplainStmt;
-typedef struct _PgQuery__CreateTableAsStmt PgQuery__CreateTableAsStmt;
-typedef struct _PgQuery__CreateSeqStmt PgQuery__CreateSeqStmt;
-typedef struct _PgQuery__AlterSeqStmt PgQuery__AlterSeqStmt;
-typedef struct _PgQuery__VariableSetStmt PgQuery__VariableSetStmt;
-typedef struct _PgQuery__VariableShowStmt PgQuery__VariableShowStmt;
-typedef struct _PgQuery__DiscardStmt PgQuery__DiscardStmt;
-typedef struct _PgQuery__CreateTrigStmt PgQuery__CreateTrigStmt;
-typedef struct _PgQuery__CreatePLangStmt PgQuery__CreatePLangStmt;
-typedef struct _PgQuery__CreateRoleStmt PgQuery__CreateRoleStmt;
-typedef struct _PgQuery__AlterRoleStmt PgQuery__AlterRoleStmt;
-typedef struct _PgQuery__DropRoleStmt PgQuery__DropRoleStmt;
-typedef struct _PgQuery__LockStmt PgQuery__LockStmt;
-typedef struct _PgQuery__ConstraintsSetStmt PgQuery__ConstraintsSetStmt;
-typedef struct _PgQuery__ReindexStmt PgQuery__ReindexStmt;
-typedef struct _PgQuery__CheckPointStmt PgQuery__CheckPointStmt;
-typedef struct _PgQuery__CreateSchemaStmt PgQuery__CreateSchemaStmt;
-typedef struct _PgQuery__AlterDatabaseStmt PgQuery__AlterDatabaseStmt;
-typedef struct _PgQuery__AlterDatabaseSetStmt PgQuery__AlterDatabaseSetStmt;
-typedef struct _PgQuery__AlterRoleSetStmt PgQuery__AlterRoleSetStmt;
-typedef struct _PgQuery__CreateConversionStmt PgQuery__CreateConversionStmt;
-typedef struct _PgQuery__CreateCastStmt PgQuery__CreateCastStmt;
-typedef struct _PgQuery__CreateOpClassStmt PgQuery__CreateOpClassStmt;
-typedef struct _PgQuery__CreateOpFamilyStmt PgQuery__CreateOpFamilyStmt;
-typedef struct _PgQuery__AlterOpFamilyStmt PgQuery__AlterOpFamilyStmt;
-typedef struct _PgQuery__PrepareStmt PgQuery__PrepareStmt;
-typedef struct _PgQuery__ExecuteStmt PgQuery__ExecuteStmt;
-typedef struct _PgQuery__DeallocateStmt PgQuery__DeallocateStmt;
-typedef struct _PgQuery__DeclareCursorStmt PgQuery__DeclareCursorStmt;
-typedef struct _PgQuery__CreateTableSpaceStmt PgQuery__CreateTableSpaceStmt;
-typedef struct _PgQuery__DropTableSpaceStmt PgQuery__DropTableSpaceStmt;
-typedef struct _PgQuery__AlterObjectDependsStmt PgQuery__AlterObjectDependsStmt;
-typedef struct _PgQuery__AlterObjectSchemaStmt PgQuery__AlterObjectSchemaStmt;
-typedef struct _PgQuery__AlterOwnerStmt PgQuery__AlterOwnerStmt;
-typedef struct _PgQuery__AlterOperatorStmt PgQuery__AlterOperatorStmt;
-typedef struct _PgQuery__AlterTypeStmt PgQuery__AlterTypeStmt;
-typedef struct _PgQuery__DropOwnedStmt PgQuery__DropOwnedStmt;
-typedef struct _PgQuery__ReassignOwnedStmt PgQuery__ReassignOwnedStmt;
-typedef struct _PgQuery__CompositeTypeStmt PgQuery__CompositeTypeStmt;
-typedef struct _PgQuery__CreateEnumStmt PgQuery__CreateEnumStmt;
-typedef struct _PgQuery__CreateRangeStmt PgQuery__CreateRangeStmt;
-typedef struct _PgQuery__AlterEnumStmt PgQuery__AlterEnumStmt;
-typedef struct _PgQuery__AlterTSDictionaryStmt PgQuery__AlterTSDictionaryStmt;
-typedef struct _PgQuery__AlterTSConfigurationStmt PgQuery__AlterTSConfigurationStmt;
-typedef struct _PgQuery__CreateFdwStmt PgQuery__CreateFdwStmt;
-typedef struct _PgQuery__AlterFdwStmt PgQuery__AlterFdwStmt;
-typedef struct _PgQuery__CreateForeignServerStmt PgQuery__CreateForeignServerStmt;
-typedef struct _PgQuery__AlterForeignServerStmt PgQuery__AlterForeignServerStmt;
-typedef struct _PgQuery__CreateUserMappingStmt PgQuery__CreateUserMappingStmt;
-typedef struct _PgQuery__AlterUserMappingStmt PgQuery__AlterUserMappingStmt;
-typedef struct _PgQuery__DropUserMappingStmt PgQuery__DropUserMappingStmt;
-typedef struct _PgQuery__AlterTableSpaceOptionsStmt PgQuery__AlterTableSpaceOptionsStmt;
-typedef struct _PgQuery__AlterTableMoveAllStmt PgQuery__AlterTableMoveAllStmt;
-typedef struct _PgQuery__SecLabelStmt PgQuery__SecLabelStmt;
-typedef struct _PgQuery__CreateForeignTableStmt PgQuery__CreateForeignTableStmt;
-typedef struct _PgQuery__ImportForeignSchemaStmt PgQuery__ImportForeignSchemaStmt;
-typedef struct _PgQuery__CreateExtensionStmt PgQuery__CreateExtensionStmt;
-typedef struct _PgQuery__AlterExtensionStmt PgQuery__AlterExtensionStmt;
-typedef struct _PgQuery__AlterExtensionContentsStmt PgQuery__AlterExtensionContentsStmt;
-typedef struct _PgQuery__CreateEventTrigStmt PgQuery__CreateEventTrigStmt;
-typedef struct _PgQuery__AlterEventTrigStmt PgQuery__AlterEventTrigStmt;
-typedef struct _PgQuery__RefreshMatViewStmt PgQuery__RefreshMatViewStmt;
-typedef struct _PgQuery__ReplicaIdentityStmt PgQuery__ReplicaIdentityStmt;
-typedef struct _PgQuery__AlterSystemStmt PgQuery__AlterSystemStmt;
-typedef struct _PgQuery__CreatePolicyStmt PgQuery__CreatePolicyStmt;
-typedef struct _PgQuery__AlterPolicyStmt PgQuery__AlterPolicyStmt;
-typedef struct _PgQuery__CreateTransformStmt PgQuery__CreateTransformStmt;
-typedef struct _PgQuery__CreateAmStmt PgQuery__CreateAmStmt;
-typedef struct _PgQuery__CreatePublicationStmt PgQuery__CreatePublicationStmt;
-typedef struct _PgQuery__AlterPublicationStmt PgQuery__AlterPublicationStmt;
-typedef struct _PgQuery__CreateSubscriptionStmt PgQuery__CreateSubscriptionStmt;
-typedef struct _PgQuery__AlterSubscriptionStmt PgQuery__AlterSubscriptionStmt;
-typedef struct _PgQuery__DropSubscriptionStmt PgQuery__DropSubscriptionStmt;
-typedef struct _PgQuery__CreateStatsStmt PgQuery__CreateStatsStmt;
-typedef struct _PgQuery__AlterCollationStmt PgQuery__AlterCollationStmt;
-typedef struct _PgQuery__CallStmt PgQuery__CallStmt;
-typedef struct _PgQuery__AlterStatsStmt PgQuery__AlterStatsStmt;
-typedef struct _PgQuery__AExpr PgQuery__AExpr;
-typedef struct _PgQuery__ColumnRef PgQuery__ColumnRef;
-typedef struct _PgQuery__ParamRef PgQuery__ParamRef;
-typedef struct _PgQuery__AConst PgQuery__AConst;
-typedef struct _PgQuery__FuncCall PgQuery__FuncCall;
-typedef struct _PgQuery__AStar PgQuery__AStar;
-typedef struct _PgQuery__AIndices PgQuery__AIndices;
-typedef struct _PgQuery__AIndirection PgQuery__AIndirection;
-typedef struct _PgQuery__AArrayExpr PgQuery__AArrayExpr;
-typedef struct _PgQuery__ResTarget PgQuery__ResTarget;
-typedef struct _PgQuery__MultiAssignRef PgQuery__MultiAssignRef;
-typedef struct _PgQuery__TypeCast PgQuery__TypeCast;
-typedef struct _PgQuery__CollateClause PgQuery__CollateClause;
-typedef struct _PgQuery__SortBy PgQuery__SortBy;
-typedef struct _PgQuery__WindowDef PgQuery__WindowDef;
-typedef struct _PgQuery__RangeSubselect PgQuery__RangeSubselect;
-typedef struct _PgQuery__RangeFunction PgQuery__RangeFunction;
-typedef struct _PgQuery__RangeTableSample PgQuery__RangeTableSample;
-typedef struct _PgQuery__RangeTableFunc PgQuery__RangeTableFunc;
-typedef struct _PgQuery__RangeTableFuncCol PgQuery__RangeTableFuncCol;
-typedef struct _PgQuery__TypeName PgQuery__TypeName;
-typedef struct _PgQuery__ColumnDef PgQuery__ColumnDef;
-typedef struct _PgQuery__IndexElem PgQuery__IndexElem;
-typedef struct _PgQuery__Constraint PgQuery__Constraint;
-typedef struct _PgQuery__DefElem PgQuery__DefElem;
-typedef struct _PgQuery__RangeTblEntry PgQuery__RangeTblEntry;
-typedef struct _PgQuery__RangeTblFunction PgQuery__RangeTblFunction;
-typedef struct _PgQuery__TableSampleClause PgQuery__TableSampleClause;
-typedef struct _PgQuery__WithCheckOption PgQuery__WithCheckOption;
-typedef struct _PgQuery__SortGroupClause PgQuery__SortGroupClause;
-typedef struct _PgQuery__GroupingSet PgQuery__GroupingSet;
-typedef struct _PgQuery__WindowClause PgQuery__WindowClause;
-typedef struct _PgQuery__ObjectWithArgs PgQuery__ObjectWithArgs;
-typedef struct _PgQuery__AccessPriv PgQuery__AccessPriv;
-typedef struct _PgQuery__CreateOpClassItem PgQuery__CreateOpClassItem;
-typedef struct _PgQuery__TableLikeClause PgQuery__TableLikeClause;
-typedef struct _PgQuery__FunctionParameter PgQuery__FunctionParameter;
-typedef struct _PgQuery__LockingClause PgQuery__LockingClause;
-typedef struct _PgQuery__RowMarkClause PgQuery__RowMarkClause;
-typedef struct _PgQuery__XmlSerialize PgQuery__XmlSerialize;
-typedef struct _PgQuery__WithClause PgQuery__WithClause;
-typedef struct _PgQuery__InferClause PgQuery__InferClause;
-typedef struct _PgQuery__OnConflictClause PgQuery__OnConflictClause;
-typedef struct _PgQuery__CommonTableExpr PgQuery__CommonTableExpr;
-typedef struct _PgQuery__RoleSpec PgQuery__RoleSpec;
-typedef struct _PgQuery__TriggerTransition PgQuery__TriggerTransition;
-typedef struct _PgQuery__PartitionElem PgQuery__PartitionElem;
-typedef struct _PgQuery__PartitionSpec PgQuery__PartitionSpec;
-typedef struct _PgQuery__PartitionBoundSpec PgQuery__PartitionBoundSpec;
-typedef struct _PgQuery__PartitionRangeDatum PgQuery__PartitionRangeDatum;
-typedef struct _PgQuery__PartitionCmd PgQuery__PartitionCmd;
-typedef struct _PgQuery__VacuumRelation PgQuery__VacuumRelation;
-typedef struct _PgQuery__InlineCodeBlock PgQuery__InlineCodeBlock;
-typedef struct _PgQuery__CallContext PgQuery__CallContext;
-typedef struct _PgQuery__ScanToken PgQuery__ScanToken;
+typedef struct PgQuery__ParseResult PgQuery__ParseResult;
+typedef struct PgQuery__ScanResult PgQuery__ScanResult;
+typedef struct PgQuery__Node PgQuery__Node;
+typedef struct PgQuery__Integer PgQuery__Integer;
+typedef struct PgQuery__Float PgQuery__Float;
+typedef struct PgQuery__String PgQuery__String;
+typedef struct PgQuery__BitString PgQuery__BitString;
+typedef struct PgQuery__Null PgQuery__Null;
+typedef struct PgQuery__List PgQuery__List;
+typedef struct PgQuery__OidList PgQuery__OidList;
+typedef struct PgQuery__IntList PgQuery__IntList;
+typedef struct PgQuery__Alias PgQuery__Alias;
+typedef struct PgQuery__RangeVar PgQuery__RangeVar;
+typedef struct PgQuery__TableFunc PgQuery__TableFunc;
+typedef struct PgQuery__Expr PgQuery__Expr;
+typedef struct PgQuery__Var PgQuery__Var;
+typedef struct PgQuery__Param PgQuery__Param;
+typedef struct PgQuery__Aggref PgQuery__Aggref;
+typedef struct PgQuery__GroupingFunc PgQuery__GroupingFunc;
+typedef struct PgQuery__WindowFunc PgQuery__WindowFunc;
+typedef struct PgQuery__SubscriptingRef PgQuery__SubscriptingRef;
+typedef struct PgQuery__FuncExpr PgQuery__FuncExpr;
+typedef struct PgQuery__NamedArgExpr PgQuery__NamedArgExpr;
+typedef struct PgQuery__OpExpr PgQuery__OpExpr;
+typedef struct PgQuery__DistinctExpr PgQuery__DistinctExpr;
+typedef struct PgQuery__NullIfExpr PgQuery__NullIfExpr;
+typedef struct PgQuery__ScalarArrayOpExpr PgQuery__ScalarArrayOpExpr;
+typedef struct PgQuery__BoolExpr PgQuery__BoolExpr;
+typedef struct PgQuery__SubLink PgQuery__SubLink;
+typedef struct PgQuery__SubPlan PgQuery__SubPlan;
+typedef struct PgQuery__AlternativeSubPlan PgQuery__AlternativeSubPlan;
+typedef struct PgQuery__FieldSelect PgQuery__FieldSelect;
+typedef struct PgQuery__FieldStore PgQuery__FieldStore;
+typedef struct PgQuery__RelabelType PgQuery__RelabelType;
+typedef struct PgQuery__CoerceViaIO PgQuery__CoerceViaIO;
+typedef struct PgQuery__ArrayCoerceExpr PgQuery__ArrayCoerceExpr;
+typedef struct PgQuery__ConvertRowtypeExpr PgQuery__ConvertRowtypeExpr;
+typedef struct PgQuery__CollateExpr PgQuery__CollateExpr;
+typedef struct PgQuery__CaseExpr PgQuery__CaseExpr;
+typedef struct PgQuery__CaseWhen PgQuery__CaseWhen;
+typedef struct PgQuery__CaseTestExpr PgQuery__CaseTestExpr;
+typedef struct PgQuery__ArrayExpr PgQuery__ArrayExpr;
+typedef struct PgQuery__RowExpr PgQuery__RowExpr;
+typedef struct PgQuery__RowCompareExpr PgQuery__RowCompareExpr;
+typedef struct PgQuery__CoalesceExpr PgQuery__CoalesceExpr;
+typedef struct PgQuery__MinMaxExpr PgQuery__MinMaxExpr;
+typedef struct PgQuery__SQLValueFunction PgQuery__SQLValueFunction;
+typedef struct PgQuery__XmlExpr PgQuery__XmlExpr;
+typedef struct PgQuery__NullTest PgQuery__NullTest;
+typedef struct PgQuery__BooleanTest PgQuery__BooleanTest;
+typedef struct PgQuery__CoerceToDomain PgQuery__CoerceToDomain;
+typedef struct PgQuery__CoerceToDomainValue PgQuery__CoerceToDomainValue;
+typedef struct PgQuery__SetToDefault PgQuery__SetToDefault;
+typedef struct PgQuery__CurrentOfExpr PgQuery__CurrentOfExpr;
+typedef struct PgQuery__NextValueExpr PgQuery__NextValueExpr;
+typedef struct PgQuery__InferenceElem PgQuery__InferenceElem;
+typedef struct PgQuery__TargetEntry PgQuery__TargetEntry;
+typedef struct PgQuery__RangeTblRef PgQuery__RangeTblRef;
+typedef struct PgQuery__JoinExpr PgQuery__JoinExpr;
+typedef struct PgQuery__FromExpr PgQuery__FromExpr;
+typedef struct PgQuery__OnConflictExpr PgQuery__OnConflictExpr;
+typedef struct PgQuery__IntoClause PgQuery__IntoClause;
+typedef struct PgQuery__RawStmt PgQuery__RawStmt;
+typedef struct PgQuery__Query PgQuery__Query;
+typedef struct PgQuery__InsertStmt PgQuery__InsertStmt;
+typedef struct PgQuery__DeleteStmt PgQuery__DeleteStmt;
+typedef struct PgQuery__UpdateStmt PgQuery__UpdateStmt;
+typedef struct PgQuery__SelectStmt PgQuery__SelectStmt;
+typedef struct PgQuery__AlterTableStmt PgQuery__AlterTableStmt;
+typedef struct PgQuery__AlterTableCmd PgQuery__AlterTableCmd;
+typedef struct PgQuery__AlterDomainStmt PgQuery__AlterDomainStmt;
+typedef struct PgQuery__SetOperationStmt PgQuery__SetOperationStmt;
+typedef struct PgQuery__GrantStmt PgQuery__GrantStmt;
+typedef struct PgQuery__GrantRoleStmt PgQuery__GrantRoleStmt;
+typedef struct PgQuery__AlterDefaultPrivilegesStmt PgQuery__AlterDefaultPrivilegesStmt;
+typedef struct PgQuery__ClosePortalStmt PgQuery__ClosePortalStmt;
+typedef struct PgQuery__ClusterStmt PgQuery__ClusterStmt;
+typedef struct PgQuery__CopyStmt PgQuery__CopyStmt;
+typedef struct PgQuery__CreateStmt PgQuery__CreateStmt;
+typedef struct PgQuery__DefineStmt PgQuery__DefineStmt;
+typedef struct PgQuery__DropStmt PgQuery__DropStmt;
+typedef struct PgQuery__TruncateStmt PgQuery__TruncateStmt;
+typedef struct PgQuery__CommentStmt PgQuery__CommentStmt;
+typedef struct PgQuery__FetchStmt PgQuery__FetchStmt;
+typedef struct PgQuery__IndexStmt PgQuery__IndexStmt;
+typedef struct PgQuery__CreateFunctionStmt PgQuery__CreateFunctionStmt;
+typedef struct PgQuery__AlterFunctionStmt PgQuery__AlterFunctionStmt;
+typedef struct PgQuery__DoStmt PgQuery__DoStmt;
+typedef struct PgQuery__RenameStmt PgQuery__RenameStmt;
+typedef struct PgQuery__RuleStmt PgQuery__RuleStmt;
+typedef struct PgQuery__NotifyStmt PgQuery__NotifyStmt;
+typedef struct PgQuery__ListenStmt PgQuery__ListenStmt;
+typedef struct PgQuery__UnlistenStmt PgQuery__UnlistenStmt;
+typedef struct PgQuery__TransactionStmt PgQuery__TransactionStmt;
+typedef struct PgQuery__ViewStmt PgQuery__ViewStmt;
+typedef struct PgQuery__LoadStmt PgQuery__LoadStmt;
+typedef struct PgQuery__CreateDomainStmt PgQuery__CreateDomainStmt;
+typedef struct PgQuery__CreatedbStmt PgQuery__CreatedbStmt;
+typedef struct PgQuery__DropdbStmt PgQuery__DropdbStmt;
+typedef struct PgQuery__VacuumStmt PgQuery__VacuumStmt;
+typedef struct PgQuery__ExplainStmt PgQuery__ExplainStmt;
+typedef struct PgQuery__CreateTableAsStmt PgQuery__CreateTableAsStmt;
+typedef struct PgQuery__CreateSeqStmt PgQuery__CreateSeqStmt;
+typedef struct PgQuery__AlterSeqStmt PgQuery__AlterSeqStmt;
+typedef struct PgQuery__VariableSetStmt PgQuery__VariableSetStmt;
+typedef struct PgQuery__VariableShowStmt PgQuery__VariableShowStmt;
+typedef struct PgQuery__DiscardStmt PgQuery__DiscardStmt;
+typedef struct PgQuery__CreateTrigStmt PgQuery__CreateTrigStmt;
+typedef struct PgQuery__CreatePLangStmt PgQuery__CreatePLangStmt;
+typedef struct PgQuery__CreateRoleStmt PgQuery__CreateRoleStmt;
+typedef struct PgQuery__AlterRoleStmt PgQuery__AlterRoleStmt;
+typedef struct PgQuery__DropRoleStmt PgQuery__DropRoleStmt;
+typedef struct PgQuery__LockStmt PgQuery__LockStmt;
+typedef struct PgQuery__ConstraintsSetStmt PgQuery__ConstraintsSetStmt;
+typedef struct PgQuery__ReindexStmt PgQuery__ReindexStmt;
+typedef struct PgQuery__CheckPointStmt PgQuery__CheckPointStmt;
+typedef struct PgQuery__CreateSchemaStmt PgQuery__CreateSchemaStmt;
+typedef struct PgQuery__AlterDatabaseStmt PgQuery__AlterDatabaseStmt;
+typedef struct PgQuery__AlterDatabaseSetStmt PgQuery__AlterDatabaseSetStmt;
+typedef struct PgQuery__AlterRoleSetStmt PgQuery__AlterRoleSetStmt;
+typedef struct PgQuery__CreateConversionStmt PgQuery__CreateConversionStmt;
+typedef struct PgQuery__CreateCastStmt PgQuery__CreateCastStmt;
+typedef struct PgQuery__CreateOpClassStmt PgQuery__CreateOpClassStmt;
+typedef struct PgQuery__CreateOpFamilyStmt PgQuery__CreateOpFamilyStmt;
+typedef struct PgQuery__AlterOpFamilyStmt PgQuery__AlterOpFamilyStmt;
+typedef struct PgQuery__PrepareStmt PgQuery__PrepareStmt;
+typedef struct PgQuery__ExecuteStmt PgQuery__ExecuteStmt;
+typedef struct PgQuery__DeallocateStmt PgQuery__DeallocateStmt;
+typedef struct PgQuery__DeclareCursorStmt PgQuery__DeclareCursorStmt;
+typedef struct PgQuery__CreateTableSpaceStmt PgQuery__CreateTableSpaceStmt;
+typedef struct PgQuery__DropTableSpaceStmt PgQuery__DropTableSpaceStmt;
+typedef struct PgQuery__AlterObjectDependsStmt PgQuery__AlterObjectDependsStmt;
+typedef struct PgQuery__AlterObjectSchemaStmt PgQuery__AlterObjectSchemaStmt;
+typedef struct PgQuery__AlterOwnerStmt PgQuery__AlterOwnerStmt;
+typedef struct PgQuery__AlterOperatorStmt PgQuery__AlterOperatorStmt;
+typedef struct PgQuery__AlterTypeStmt PgQuery__AlterTypeStmt;
+typedef struct PgQuery__DropOwnedStmt PgQuery__DropOwnedStmt;
+typedef struct PgQuery__ReassignOwnedStmt PgQuery__ReassignOwnedStmt;
+typedef struct PgQuery__CompositeTypeStmt PgQuery__CompositeTypeStmt;
+typedef struct PgQuery__CreateEnumStmt PgQuery__CreateEnumStmt;
+typedef struct PgQuery__CreateRangeStmt PgQuery__CreateRangeStmt;
+typedef struct PgQuery__AlterEnumStmt PgQuery__AlterEnumStmt;
+typedef struct PgQuery__AlterTSDictionaryStmt PgQuery__AlterTSDictionaryStmt;
+typedef struct PgQuery__AlterTSConfigurationStmt PgQuery__AlterTSConfigurationStmt;
+typedef struct PgQuery__CreateFdwStmt PgQuery__CreateFdwStmt;
+typedef struct PgQuery__AlterFdwStmt PgQuery__AlterFdwStmt;
+typedef struct PgQuery__CreateForeignServerStmt PgQuery__CreateForeignServerStmt;
+typedef struct PgQuery__AlterForeignServerStmt PgQuery__AlterForeignServerStmt;
+typedef struct PgQuery__CreateUserMappingStmt PgQuery__CreateUserMappingStmt;
+typedef struct PgQuery__AlterUserMappingStmt PgQuery__AlterUserMappingStmt;
+typedef struct PgQuery__DropUserMappingStmt PgQuery__DropUserMappingStmt;
+typedef struct PgQuery__AlterTableSpaceOptionsStmt PgQuery__AlterTableSpaceOptionsStmt;
+typedef struct PgQuery__AlterTableMoveAllStmt PgQuery__AlterTableMoveAllStmt;
+typedef struct PgQuery__SecLabelStmt PgQuery__SecLabelStmt;
+typedef struct PgQuery__CreateForeignTableStmt PgQuery__CreateForeignTableStmt;
+typedef struct PgQuery__ImportForeignSchemaStmt PgQuery__ImportForeignSchemaStmt;
+typedef struct PgQuery__CreateExtensionStmt PgQuery__CreateExtensionStmt;
+typedef struct PgQuery__AlterExtensionStmt PgQuery__AlterExtensionStmt;
+typedef struct PgQuery__AlterExtensionContentsStmt PgQuery__AlterExtensionContentsStmt;
+typedef struct PgQuery__CreateEventTrigStmt PgQuery__CreateEventTrigStmt;
+typedef struct PgQuery__AlterEventTrigStmt PgQuery__AlterEventTrigStmt;
+typedef struct PgQuery__RefreshMatViewStmt PgQuery__RefreshMatViewStmt;
+typedef struct PgQuery__ReplicaIdentityStmt PgQuery__ReplicaIdentityStmt;
+typedef struct PgQuery__AlterSystemStmt PgQuery__AlterSystemStmt;
+typedef struct PgQuery__CreatePolicyStmt PgQuery__CreatePolicyStmt;
+typedef struct PgQuery__AlterPolicyStmt PgQuery__AlterPolicyStmt;
+typedef struct PgQuery__CreateTransformStmt PgQuery__CreateTransformStmt;
+typedef struct PgQuery__CreateAmStmt PgQuery__CreateAmStmt;
+typedef struct PgQuery__CreatePublicationStmt PgQuery__CreatePublicationStmt;
+typedef struct PgQuery__AlterPublicationStmt PgQuery__AlterPublicationStmt;
+typedef struct PgQuery__CreateSubscriptionStmt PgQuery__CreateSubscriptionStmt;
+typedef struct PgQuery__AlterSubscriptionStmt PgQuery__AlterSubscriptionStmt;
+typedef struct PgQuery__DropSubscriptionStmt PgQuery__DropSubscriptionStmt;
+typedef struct PgQuery__CreateStatsStmt PgQuery__CreateStatsStmt;
+typedef struct PgQuery__AlterCollationStmt PgQuery__AlterCollationStmt;
+typedef struct PgQuery__CallStmt PgQuery__CallStmt;
+typedef struct PgQuery__AlterStatsStmt PgQuery__AlterStatsStmt;
+typedef struct PgQuery__AExpr PgQuery__AExpr;
+typedef struct PgQuery__ColumnRef PgQuery__ColumnRef;
+typedef struct PgQuery__ParamRef PgQuery__ParamRef;
+typedef struct PgQuery__AConst PgQuery__AConst;
+typedef struct PgQuery__FuncCall PgQuery__FuncCall;
+typedef struct PgQuery__AStar PgQuery__AStar;
+typedef struct PgQuery__AIndices PgQuery__AIndices;
+typedef struct PgQuery__AIndirection PgQuery__AIndirection;
+typedef struct PgQuery__AArrayExpr PgQuery__AArrayExpr;
+typedef struct PgQuery__ResTarget PgQuery__ResTarget;
+typedef struct PgQuery__MultiAssignRef PgQuery__MultiAssignRef;
+typedef struct PgQuery__TypeCast PgQuery__TypeCast;
+typedef struct PgQuery__CollateClause PgQuery__CollateClause;
+typedef struct PgQuery__SortBy PgQuery__SortBy;
+typedef struct PgQuery__WindowDef PgQuery__WindowDef;
+typedef struct PgQuery__RangeSubselect PgQuery__RangeSubselect;
+typedef struct PgQuery__RangeFunction PgQuery__RangeFunction;
+typedef struct PgQuery__RangeTableSample PgQuery__RangeTableSample;
+typedef struct PgQuery__RangeTableFunc PgQuery__RangeTableFunc;
+typedef struct PgQuery__RangeTableFuncCol PgQuery__RangeTableFuncCol;
+typedef struct PgQuery__TypeName PgQuery__TypeName;
+typedef struct PgQuery__ColumnDef PgQuery__ColumnDef;
+typedef struct PgQuery__IndexElem PgQuery__IndexElem;
+typedef struct PgQuery__Constraint PgQuery__Constraint;
+typedef struct PgQuery__DefElem PgQuery__DefElem;
+typedef struct PgQuery__RangeTblEntry PgQuery__RangeTblEntry;
+typedef struct PgQuery__RangeTblFunction PgQuery__RangeTblFunction;
+typedef struct PgQuery__TableSampleClause PgQuery__TableSampleClause;
+typedef struct PgQuery__WithCheckOption PgQuery__WithCheckOption;
+typedef struct PgQuery__SortGroupClause PgQuery__SortGroupClause;
+typedef struct PgQuery__GroupingSet PgQuery__GroupingSet;
+typedef struct PgQuery__WindowClause PgQuery__WindowClause;
+typedef struct PgQuery__ObjectWithArgs PgQuery__ObjectWithArgs;
+typedef struct PgQuery__AccessPriv PgQuery__AccessPriv;
+typedef struct PgQuery__CreateOpClassItem PgQuery__CreateOpClassItem;
+typedef struct PgQuery__TableLikeClause PgQuery__TableLikeClause;
+typedef struct PgQuery__FunctionParameter PgQuery__FunctionParameter;
+typedef struct PgQuery__LockingClause PgQuery__LockingClause;
+typedef struct PgQuery__RowMarkClause PgQuery__RowMarkClause;
+typedef struct PgQuery__XmlSerialize PgQuery__XmlSerialize;
+typedef struct PgQuery__WithClause PgQuery__WithClause;
+typedef struct PgQuery__InferClause PgQuery__InferClause;
+typedef struct PgQuery__OnConflictClause PgQuery__OnConflictClause;
+typedef struct PgQuery__CommonTableExpr PgQuery__CommonTableExpr;
+typedef struct PgQuery__RoleSpec PgQuery__RoleSpec;
+typedef struct PgQuery__TriggerTransition PgQuery__TriggerTransition;
+typedef struct PgQuery__PartitionElem PgQuery__PartitionElem;
+typedef struct PgQuery__PartitionSpec PgQuery__PartitionSpec;
+typedef struct PgQuery__PartitionBoundSpec PgQuery__PartitionBoundSpec;
+typedef struct PgQuery__PartitionRangeDatum PgQuery__PartitionRangeDatum;
+typedef struct PgQuery__PartitionCmd PgQuery__PartitionCmd;
+typedef struct PgQuery__VacuumRelation PgQuery__VacuumRelation;
+typedef struct PgQuery__InlineCodeBlock PgQuery__InlineCodeBlock;
+typedef struct PgQuery__CallContext PgQuery__CallContext;
+typedef struct PgQuery__ScanToken PgQuery__ScanToken;
 
 
 /* --- enums --- */
@@ -929,6 +929,10 @@ typedef enum _PgQuery__Token {
    * "["
    */
   PG_QUERY__TOKEN__ASCII_91 = 91,
+  /*
+   * "\"
+   */
+  PG_QUERY__TOKEN__ASCII_92 = 92,
   /*
    * "]"
    */
@@ -1419,7 +1423,7 @@ typedef enum _PgQuery__Token {
 
 /* --- messages --- */
 
-struct  _PgQuery__ParseResult
+struct  PgQuery__ParseResult
 {
   ProtobufCMessage base;
   int32_t version;
@@ -1431,7 +1435,7 @@ struct  _PgQuery__ParseResult
     , 0, 0,NULL }
 
 
-struct  _PgQuery__ScanResult
+struct  PgQuery__ScanResult
 {
   ProtobufCMessage base;
   int32_t version;
@@ -1673,10 +1677,10 @@ typedef enum {
   PG_QUERY__NODE__NODE_LIST = 226,
   PG_QUERY__NODE__NODE_INT_LIST = 227,
   PG_QUERY__NODE__NODE_OID_LIST = 228
-    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(PG_QUERY__NODE__NODE)
+    PROTOBUF_C__FORCE_ENUM_TO_BE_INT_SIZE(PG_QUERY__NODE__NODE__CASE)
 } PgQuery__Node__NodeCase;
 
-struct  _PgQuery__Node
+struct  PgQuery__Node
 {
   ProtobufCMessage base;
   PgQuery__Node__NodeCase node_case;
@@ -1916,7 +1920,7 @@ struct  _PgQuery__Node
     , PG_QUERY__NODE__NODE__NOT_SET, {0} }
 
 
-struct  _PgQuery__Integer
+struct  PgQuery__Integer
 {
   ProtobufCMessage base;
   /*
@@ -1929,7 +1933,7 @@ struct  _PgQuery__Integer
     , 0 }
 
 
-struct  _PgQuery__Float
+struct  PgQuery__Float
 {
   ProtobufCMessage base;
   /*
@@ -1942,7 +1946,7 @@ struct  _PgQuery__Float
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__String
+struct  PgQuery__String
 {
   ProtobufCMessage base;
   /*
@@ -1955,7 +1959,7 @@ struct  _PgQuery__String
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__BitString
+struct  PgQuery__BitString
 {
   ProtobufCMessage base;
   /*
@@ -1968,7 +1972,7 @@ struct  _PgQuery__BitString
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__Null
+struct  PgQuery__Null
 {
   ProtobufCMessage base;
 };
@@ -1977,7 +1981,7 @@ struct  _PgQuery__Null
      }
 
 
-struct  _PgQuery__List
+struct  PgQuery__List
 {
   ProtobufCMessage base;
   size_t n_items;
@@ -1988,7 +1992,7 @@ struct  _PgQuery__List
     , 0,NULL }
 
 
-struct  _PgQuery__OidList
+struct  PgQuery__OidList
 {
   ProtobufCMessage base;
   size_t n_items;
@@ -1999,7 +2003,7 @@ struct  _PgQuery__OidList
     , 0,NULL }
 
 
-struct  _PgQuery__IntList
+struct  PgQuery__IntList
 {
   ProtobufCMessage base;
   size_t n_items;
@@ -2010,7 +2014,7 @@ struct  _PgQuery__IntList
     , 0,NULL }
 
 
-struct  _PgQuery__Alias
+struct  PgQuery__Alias
 {
   ProtobufCMessage base;
   char *aliasname;
@@ -2022,7 +2026,7 @@ struct  _PgQuery__Alias
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__RangeVar
+struct  PgQuery__RangeVar
 {
   ProtobufCMessage base;
   char *catalogname;
@@ -2038,7 +2042,7 @@ struct  _PgQuery__RangeVar
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0, (char *)protobuf_c_empty_string, NULL, 0 }
 
 
-struct  _PgQuery__TableFunc
+struct  PgQuery__TableFunc
 {
   ProtobufCMessage base;
   size_t n_ns_uris;
@@ -2069,7 +2073,7 @@ struct  _PgQuery__TableFunc
     , 0,NULL, 0,NULL, NULL, NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__Expr
+struct  PgQuery__Expr
 {
   ProtobufCMessage base;
 };
@@ -2078,7 +2082,7 @@ struct  _PgQuery__Expr
      }
 
 
-struct  _PgQuery__Var
+struct  PgQuery__Var
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2097,7 +2101,7 @@ struct  _PgQuery__Var
     , NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__Param
+struct  PgQuery__Param
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2113,7 +2117,7 @@ struct  _PgQuery__Param
     , NULL, PG_QUERY__PARAM_KIND__PARAM_KIND_UNDEFINED, 0, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__Aggref
+struct  PgQuery__Aggref
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2145,7 +2149,7 @@ struct  _PgQuery__Aggref
     , NULL, 0, 0, 0, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL, NULL, 0, 0, (char *)protobuf_c_empty_string, 0, PG_QUERY__AGG_SPLIT__AGG_SPLIT_UNDEFINED, 0 }
 
 
-struct  _PgQuery__GroupingFunc
+struct  PgQuery__GroupingFunc
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2163,7 +2167,7 @@ struct  _PgQuery__GroupingFunc
     , NULL, 0,NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__WindowFunc
+struct  PgQuery__WindowFunc
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2184,7 +2188,7 @@ struct  _PgQuery__WindowFunc
     , NULL, 0, 0, 0, 0, 0,NULL, NULL, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__SubscriptingRef
+struct  PgQuery__SubscriptingRef
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2204,7 +2208,7 @@ struct  _PgQuery__SubscriptingRef
     , NULL, 0, 0, 0, 0, 0,NULL, 0,NULL, NULL, NULL }
 
 
-struct  _PgQuery__FuncExpr
+struct  PgQuery__FuncExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2224,7 +2228,7 @@ struct  _PgQuery__FuncExpr
     , NULL, 0, 0, 0, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__NamedArgExpr
+struct  PgQuery__NamedArgExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2238,7 +2242,7 @@ struct  _PgQuery__NamedArgExpr
     , NULL, NULL, (char *)protobuf_c_empty_string, 0, 0 }
 
 
-struct  _PgQuery__OpExpr
+struct  PgQuery__OpExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2257,7 +2261,7 @@ struct  _PgQuery__OpExpr
     , NULL, 0, 0, 0, 0, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__DistinctExpr
+struct  PgQuery__DistinctExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2276,7 +2280,7 @@ struct  _PgQuery__DistinctExpr
     , NULL, 0, 0, 0, 0, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__NullIfExpr
+struct  PgQuery__NullIfExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2295,7 +2299,7 @@ struct  _PgQuery__NullIfExpr
     , NULL, 0, 0, 0, 0, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__ScalarArrayOpExpr
+struct  PgQuery__ScalarArrayOpExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2312,7 +2316,7 @@ struct  _PgQuery__ScalarArrayOpExpr
     , NULL, 0, 0, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__BoolExpr
+struct  PgQuery__BoolExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2326,7 +2330,7 @@ struct  _PgQuery__BoolExpr
     , NULL, PG_QUERY__BOOL_EXPR_TYPE__BOOL_EXPR_TYPE_UNDEFINED, 0,NULL, 0 }
 
 
-struct  _PgQuery__SubLink
+struct  PgQuery__SubLink
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2343,7 +2347,7 @@ struct  _PgQuery__SubLink
     , NULL, PG_QUERY__SUB_LINK_TYPE__SUB_LINK_TYPE_UNDEFINED, 0, NULL, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__SubPlan
+struct  PgQuery__SubPlan
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2373,7 +2377,7 @@ struct  _PgQuery__SubPlan
     , NULL, PG_QUERY__SUB_LINK_TYPE__SUB_LINK_TYPE_UNDEFINED, NULL, 0,NULL, 0, (char *)protobuf_c_empty_string, 0, 0, 0, 0, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__AlternativeSubPlan
+struct  PgQuery__AlternativeSubPlan
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2385,7 +2389,7 @@ struct  _PgQuery__AlternativeSubPlan
     , NULL, 0,NULL }
 
 
-struct  _PgQuery__FieldSelect
+struct  PgQuery__FieldSelect
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2400,7 +2404,7 @@ struct  _PgQuery__FieldSelect
     , NULL, NULL, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__FieldStore
+struct  PgQuery__FieldStore
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2416,7 +2420,7 @@ struct  _PgQuery__FieldStore
     , NULL, NULL, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__RelabelType
+struct  PgQuery__RelabelType
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2432,7 +2436,7 @@ struct  _PgQuery__RelabelType
     , NULL, NULL, 0, 0, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0 }
 
 
-struct  _PgQuery__CoerceViaIO
+struct  PgQuery__CoerceViaIO
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2447,7 +2451,7 @@ struct  _PgQuery__CoerceViaIO
     , NULL, NULL, 0, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0 }
 
 
-struct  _PgQuery__ArrayCoerceExpr
+struct  PgQuery__ArrayCoerceExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2464,7 +2468,7 @@ struct  _PgQuery__ArrayCoerceExpr
     , NULL, NULL, NULL, 0, 0, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0 }
 
 
-struct  _PgQuery__ConvertRowtypeExpr
+struct  PgQuery__ConvertRowtypeExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2478,7 +2482,7 @@ struct  _PgQuery__ConvertRowtypeExpr
     , NULL, NULL, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0 }
 
 
-struct  _PgQuery__CollateExpr
+struct  PgQuery__CollateExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2491,7 +2495,7 @@ struct  _PgQuery__CollateExpr
     , NULL, NULL, 0, 0 }
 
 
-struct  _PgQuery__CaseExpr
+struct  PgQuery__CaseExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2508,7 +2512,7 @@ struct  _PgQuery__CaseExpr
     , NULL, 0, 0, NULL, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__CaseWhen
+struct  PgQuery__CaseWhen
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2521,7 +2525,7 @@ struct  _PgQuery__CaseWhen
     , NULL, NULL, NULL, 0 }
 
 
-struct  _PgQuery__CaseTestExpr
+struct  PgQuery__CaseTestExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2534,7 +2538,7 @@ struct  _PgQuery__CaseTestExpr
     , NULL, 0, 0, 0 }
 
 
-struct  _PgQuery__ArrayExpr
+struct  PgQuery__ArrayExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2551,7 +2555,7 @@ struct  _PgQuery__ArrayExpr
     , NULL, 0, 0, 0, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__RowExpr
+struct  PgQuery__RowExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2568,7 +2572,7 @@ struct  _PgQuery__RowExpr
     , NULL, 0,NULL, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0,NULL, 0 }
 
 
-struct  _PgQuery__RowCompareExpr
+struct  PgQuery__RowCompareExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2589,7 +2593,7 @@ struct  _PgQuery__RowCompareExpr
     , NULL, PG_QUERY__ROW_COMPARE_TYPE__ROW_COMPARE_TYPE_UNDEFINED, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__CoalesceExpr
+struct  PgQuery__CoalesceExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2604,7 +2608,7 @@ struct  _PgQuery__CoalesceExpr
     , NULL, 0, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__MinMaxExpr
+struct  PgQuery__MinMaxExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2621,7 +2625,7 @@ struct  _PgQuery__MinMaxExpr
     , NULL, 0, 0, 0, PG_QUERY__MIN_MAX_OP__MIN_MAX_OP_UNDEFINED, 0,NULL, 0 }
 
 
-struct  _PgQuery__SQLValueFunction
+struct  PgQuery__SQLValueFunction
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2635,7 +2639,7 @@ struct  _PgQuery__SQLValueFunction
     , NULL, PG_QUERY__SQLVALUE_FUNCTION_OP__SQLVALUE_FUNCTION_OP_UNDEFINED, 0, 0, 0 }
 
 
-struct  _PgQuery__XmlExpr
+struct  PgQuery__XmlExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2657,7 +2661,7 @@ struct  _PgQuery__XmlExpr
     , NULL, PG_QUERY__XML_EXPR_OP__XML_EXPR_OP_UNDEFINED, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0,NULL, PG_QUERY__XML_OPTION_TYPE__XML_OPTION_TYPE_UNDEFINED, 0, 0, 0 }
 
 
-struct  _PgQuery__NullTest
+struct  PgQuery__NullTest
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2671,7 +2675,7 @@ struct  _PgQuery__NullTest
     , NULL, NULL, PG_QUERY__NULL_TEST_TYPE__NULL_TEST_TYPE_UNDEFINED, 0, 0 }
 
 
-struct  _PgQuery__BooleanTest
+struct  PgQuery__BooleanTest
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2684,7 +2688,7 @@ struct  _PgQuery__BooleanTest
     , NULL, NULL, PG_QUERY__BOOL_TEST_TYPE__BOOL_TEST_TYPE_UNDEFINED, 0 }
 
 
-struct  _PgQuery__CoerceToDomain
+struct  PgQuery__CoerceToDomain
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2700,7 +2704,7 @@ struct  _PgQuery__CoerceToDomain
     , NULL, NULL, 0, 0, 0, PG_QUERY__COERCION_FORM__COERCION_FORM_UNDEFINED, 0 }
 
 
-struct  _PgQuery__CoerceToDomainValue
+struct  PgQuery__CoerceToDomainValue
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2714,7 +2718,7 @@ struct  _PgQuery__CoerceToDomainValue
     , NULL, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__SetToDefault
+struct  PgQuery__SetToDefault
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2728,7 +2732,7 @@ struct  _PgQuery__SetToDefault
     , NULL, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__CurrentOfExpr
+struct  PgQuery__CurrentOfExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2741,7 +2745,7 @@ struct  _PgQuery__CurrentOfExpr
     , NULL, 0, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__NextValueExpr
+struct  PgQuery__NextValueExpr
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2753,7 +2757,7 @@ struct  _PgQuery__NextValueExpr
     , NULL, 0, 0 }
 
 
-struct  _PgQuery__InferenceElem
+struct  PgQuery__InferenceElem
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2766,7 +2770,7 @@ struct  _PgQuery__InferenceElem
     , NULL, NULL, 0, 0 }
 
 
-struct  _PgQuery__TargetEntry
+struct  PgQuery__TargetEntry
 {
   ProtobufCMessage base;
   PgQuery__Node *xpr;
@@ -2783,7 +2787,7 @@ struct  _PgQuery__TargetEntry
     , NULL, NULL, 0, (char *)protobuf_c_empty_string, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__RangeTblRef
+struct  PgQuery__RangeTblRef
 {
   ProtobufCMessage base;
   int32_t rtindex;
@@ -2793,7 +2797,7 @@ struct  _PgQuery__RangeTblRef
     , 0 }
 
 
-struct  _PgQuery__JoinExpr
+struct  PgQuery__JoinExpr
 {
   ProtobufCMessage base;
   PgQuery__JoinType jointype;
@@ -2811,7 +2815,7 @@ struct  _PgQuery__JoinExpr
     , PG_QUERY__JOIN_TYPE__JOIN_TYPE_UNDEFINED, 0, NULL, NULL, 0,NULL, NULL, NULL, 0 }
 
 
-struct  _PgQuery__FromExpr
+struct  PgQuery__FromExpr
 {
   ProtobufCMessage base;
   size_t n_fromlist;
@@ -2823,7 +2827,7 @@ struct  _PgQuery__FromExpr
     , 0,NULL, NULL }
 
 
-struct  _PgQuery__OnConflictExpr
+struct  PgQuery__OnConflictExpr
 {
   ProtobufCMessage base;
   PgQuery__OnConflictAction action;
@@ -2843,7 +2847,7 @@ struct  _PgQuery__OnConflictExpr
     , PG_QUERY__ON_CONFLICT_ACTION__ON_CONFLICT_ACTION_UNDEFINED, 0,NULL, NULL, 0, 0,NULL, NULL, 0, 0,NULL }
 
 
-struct  _PgQuery__IntoClause
+struct  PgQuery__IntoClause
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *rel;
@@ -2862,7 +2866,7 @@ struct  _PgQuery__IntoClause
     , NULL, 0,NULL, (char *)protobuf_c_empty_string, 0,NULL, PG_QUERY__ON_COMMIT_ACTION__ON_COMMIT_ACTION_UNDEFINED, (char *)protobuf_c_empty_string, NULL, 0 }
 
 
-struct  _PgQuery__RawStmt
+struct  PgQuery__RawStmt
 {
   ProtobufCMessage base;
   PgQuery__Node *stmt;
@@ -2874,7 +2878,7 @@ struct  _PgQuery__RawStmt
     , NULL, 0, 0 }
 
 
-struct  _PgQuery__Query
+struct  PgQuery__Query
 {
   ProtobufCMessage base;
   PgQuery__CmdType command_type;
@@ -2931,7 +2935,7 @@ struct  _PgQuery__Query
     , PG_QUERY__CMD_TYPE__CMD_TYPE_UNDEFINED, PG_QUERY__QUERY_SOURCE__QUERY_SOURCE_UNDEFINED, 0, NULL, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0,NULL, 0,NULL, NULL, 0,NULL, PG_QUERY__OVERRIDING_KIND__OVERRIDING_KIND_UNDEFINED, NULL, 0,NULL, 0,NULL, 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL, NULL, NULL, PG_QUERY__LIMIT_OPTION__LIMIT_OPTION_UNDEFINED, 0,NULL, NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__InsertStmt
+struct  PgQuery__InsertStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -2949,7 +2953,7 @@ struct  _PgQuery__InsertStmt
     , NULL, 0,NULL, NULL, NULL, 0,NULL, NULL, PG_QUERY__OVERRIDING_KIND__OVERRIDING_KIND_UNDEFINED }
 
 
-struct  _PgQuery__DeleteStmt
+struct  PgQuery__DeleteStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -2965,7 +2969,7 @@ struct  _PgQuery__DeleteStmt
     , NULL, 0,NULL, NULL, 0,NULL, NULL }
 
 
-struct  _PgQuery__UpdateStmt
+struct  PgQuery__UpdateStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -2983,7 +2987,7 @@ struct  _PgQuery__UpdateStmt
     , NULL, 0,NULL, NULL, 0,NULL, 0,NULL, NULL }
 
 
-struct  _PgQuery__SelectStmt
+struct  PgQuery__SelectStmt
 {
   ProtobufCMessage base;
   size_t n_distinct_clause;
@@ -3019,7 +3023,7 @@ struct  _PgQuery__SelectStmt
     , 0,NULL, NULL, 0,NULL, 0,NULL, NULL, 0,NULL, NULL, 0,NULL, 0,NULL, 0,NULL, NULL, NULL, PG_QUERY__LIMIT_OPTION__LIMIT_OPTION_UNDEFINED, 0,NULL, NULL, PG_QUERY__SET_OPERATION__SET_OPERATION_UNDEFINED, 0, NULL, NULL }
 
 
-struct  _PgQuery__AlterTableStmt
+struct  PgQuery__AlterTableStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -3033,7 +3037,7 @@ struct  _PgQuery__AlterTableStmt
     , NULL, 0,NULL, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, 0 }
 
 
-struct  _PgQuery__AlterTableCmd
+struct  PgQuery__AlterTableCmd
 {
   ProtobufCMessage base;
   PgQuery__AlterTableType subtype;
@@ -3049,7 +3053,7 @@ struct  _PgQuery__AlterTableCmd
     , PG_QUERY__ALTER_TABLE_TYPE__ALTER_TABLE_TYPE_UNDEFINED, (char *)protobuf_c_empty_string, 0, NULL, NULL, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED, 0 }
 
 
-struct  _PgQuery__AlterDomainStmt
+struct  PgQuery__AlterDomainStmt
 {
   ProtobufCMessage base;
   char *subtype;
@@ -3065,7 +3069,7 @@ struct  _PgQuery__AlterDomainStmt
     , (char *)protobuf_c_empty_string, 0,NULL, (char *)protobuf_c_empty_string, NULL, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED, 0 }
 
 
-struct  _PgQuery__SetOperationStmt
+struct  PgQuery__SetOperationStmt
 {
   ProtobufCMessage base;
   PgQuery__SetOperation op;
@@ -3086,7 +3090,7 @@ struct  _PgQuery__SetOperationStmt
     , PG_QUERY__SET_OPERATION__SET_OPERATION_UNDEFINED, 0, NULL, NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__GrantStmt
+struct  PgQuery__GrantStmt
 {
   ProtobufCMessage base;
   protobuf_c_boolean is_grant;
@@ -3106,7 +3110,7 @@ struct  _PgQuery__GrantStmt
     , 0, PG_QUERY__GRANT_TARGET_TYPE__GRANT_TARGET_TYPE_UNDEFINED, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, 0,NULL, 0,NULL, 0,NULL, 0, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED }
 
 
-struct  _PgQuery__GrantRoleStmt
+struct  PgQuery__GrantRoleStmt
 {
   ProtobufCMessage base;
   size_t n_granted_roles;
@@ -3123,7 +3127,7 @@ struct  _PgQuery__GrantRoleStmt
     , 0,NULL, 0,NULL, 0, 0, NULL, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED }
 
 
-struct  _PgQuery__AlterDefaultPrivilegesStmt
+struct  PgQuery__AlterDefaultPrivilegesStmt
 {
   ProtobufCMessage base;
   size_t n_options;
@@ -3135,7 +3139,7 @@ struct  _PgQuery__AlterDefaultPrivilegesStmt
     , 0,NULL, NULL }
 
 
-struct  _PgQuery__ClosePortalStmt
+struct  PgQuery__ClosePortalStmt
 {
   ProtobufCMessage base;
   char *portalname;
@@ -3145,7 +3149,7 @@ struct  _PgQuery__ClosePortalStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__ClusterStmt
+struct  PgQuery__ClusterStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -3157,7 +3161,7 @@ struct  _PgQuery__ClusterStmt
     , NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__CopyStmt
+struct  PgQuery__CopyStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -3176,7 +3180,7 @@ struct  _PgQuery__CopyStmt
     , NULL, NULL, 0,NULL, 0, 0, (char *)protobuf_c_empty_string, 0,NULL, NULL }
 
 
-struct  _PgQuery__CreateStmt
+struct  PgQuery__CreateStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -3201,7 +3205,7 @@ struct  _PgQuery__CreateStmt
     , NULL, 0,NULL, 0,NULL, NULL, NULL, NULL, 0,NULL, 0,NULL, PG_QUERY__ON_COMMIT_ACTION__ON_COMMIT_ACTION_UNDEFINED, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__DefineStmt
+struct  PgQuery__DefineStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType kind;
@@ -3220,7 +3224,7 @@ struct  _PgQuery__DefineStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, 0, 0,NULL, 0,NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__DropStmt
+struct  PgQuery__DropStmt
 {
   ProtobufCMessage base;
   size_t n_objects;
@@ -3235,7 +3239,7 @@ struct  _PgQuery__DropStmt
     , 0,NULL, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED, 0, 0 }
 
 
-struct  _PgQuery__TruncateStmt
+struct  PgQuery__TruncateStmt
 {
   ProtobufCMessage base;
   size_t n_relations;
@@ -3248,7 +3252,7 @@ struct  _PgQuery__TruncateStmt
     , 0,NULL, 0, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED }
 
 
-struct  _PgQuery__CommentStmt
+struct  PgQuery__CommentStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType objtype;
@@ -3260,7 +3264,7 @@ struct  _PgQuery__CommentStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__FetchStmt
+struct  PgQuery__FetchStmt
 {
   ProtobufCMessage base;
   PgQuery__FetchDirection direction;
@@ -3273,7 +3277,7 @@ struct  _PgQuery__FetchStmt
     , PG_QUERY__FETCH_DIRECTION__FETCH_DIRECTION_UNDEFINED, 0, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__IndexStmt
+struct  PgQuery__IndexStmt
 {
   ProtobufCMessage base;
   char *idxname;
@@ -3309,7 +3313,7 @@ struct  _PgQuery__IndexStmt
     , (char *)protobuf_c_empty_string, NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0,NULL, NULL, 0,NULL, (char *)protobuf_c_empty_string, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__CreateFunctionStmt
+struct  PgQuery__CreateFunctionStmt
 {
   ProtobufCMessage base;
   protobuf_c_boolean is_procedure;
@@ -3327,7 +3331,7 @@ struct  _PgQuery__CreateFunctionStmt
     , 0, 0, 0,NULL, 0,NULL, NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterFunctionStmt
+struct  PgQuery__AlterFunctionStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType objtype;
@@ -3340,7 +3344,7 @@ struct  _PgQuery__AlterFunctionStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, 0,NULL }
 
 
-struct  _PgQuery__DoStmt
+struct  PgQuery__DoStmt
 {
   ProtobufCMessage base;
   size_t n_args;
@@ -3351,7 +3355,7 @@ struct  _PgQuery__DoStmt
     , 0,NULL }
 
 
-struct  _PgQuery__RenameStmt
+struct  PgQuery__RenameStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType rename_type;
@@ -3368,7 +3372,7 @@ struct  _PgQuery__RenameStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED, 0 }
 
 
-struct  _PgQuery__RuleStmt
+struct  PgQuery__RuleStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -3385,7 +3389,7 @@ struct  _PgQuery__RuleStmt
     , NULL, (char *)protobuf_c_empty_string, NULL, PG_QUERY__CMD_TYPE__CMD_TYPE_UNDEFINED, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__NotifyStmt
+struct  PgQuery__NotifyStmt
 {
   ProtobufCMessage base;
   char *conditionname;
@@ -3396,7 +3400,7 @@ struct  _PgQuery__NotifyStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__ListenStmt
+struct  PgQuery__ListenStmt
 {
   ProtobufCMessage base;
   char *conditionname;
@@ -3406,7 +3410,7 @@ struct  _PgQuery__ListenStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__UnlistenStmt
+struct  PgQuery__UnlistenStmt
 {
   ProtobufCMessage base;
   char *conditionname;
@@ -3416,7 +3420,7 @@ struct  _PgQuery__UnlistenStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__TransactionStmt
+struct  PgQuery__TransactionStmt
 {
   ProtobufCMessage base;
   PgQuery__TransactionStmtKind kind;
@@ -3431,7 +3435,7 @@ struct  _PgQuery__TransactionStmt
     , PG_QUERY__TRANSACTION_STMT_KIND__TRANSACTION_STMT_KIND_UNDEFINED, 0,NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__ViewStmt
+struct  PgQuery__ViewStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *view;
@@ -3448,7 +3452,7 @@ struct  _PgQuery__ViewStmt
     , NULL, 0,NULL, NULL, 0, 0,NULL, PG_QUERY__VIEW_CHECK_OPTION__VIEW_CHECK_OPTION_UNDEFINED }
 
 
-struct  _PgQuery__LoadStmt
+struct  PgQuery__LoadStmt
 {
   ProtobufCMessage base;
   char *filename;
@@ -3458,7 +3462,7 @@ struct  _PgQuery__LoadStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__CreateDomainStmt
+struct  PgQuery__CreateDomainStmt
 {
   ProtobufCMessage base;
   size_t n_domainname;
@@ -3473,7 +3477,7 @@ struct  _PgQuery__CreateDomainStmt
     , 0,NULL, NULL, NULL, 0,NULL }
 
 
-struct  _PgQuery__CreatedbStmt
+struct  PgQuery__CreatedbStmt
 {
   ProtobufCMessage base;
   char *dbname;
@@ -3485,7 +3489,7 @@ struct  _PgQuery__CreatedbStmt
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__DropdbStmt
+struct  PgQuery__DropdbStmt
 {
   ProtobufCMessage base;
   char *dbname;
@@ -3498,7 +3502,7 @@ struct  _PgQuery__DropdbStmt
     , (char *)protobuf_c_empty_string, 0, 0,NULL }
 
 
-struct  _PgQuery__VacuumStmt
+struct  PgQuery__VacuumStmt
 {
   ProtobufCMessage base;
   size_t n_options;
@@ -3512,7 +3516,7 @@ struct  _PgQuery__VacuumStmt
     , 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__ExplainStmt
+struct  PgQuery__ExplainStmt
 {
   ProtobufCMessage base;
   PgQuery__Node *query;
@@ -3524,7 +3528,7 @@ struct  _PgQuery__ExplainStmt
     , NULL, 0,NULL }
 
 
-struct  _PgQuery__CreateTableAsStmt
+struct  PgQuery__CreateTableAsStmt
 {
   ProtobufCMessage base;
   PgQuery__Node *query;
@@ -3538,7 +3542,7 @@ struct  _PgQuery__CreateTableAsStmt
     , NULL, NULL, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, 0, 0 }
 
 
-struct  _PgQuery__CreateSeqStmt
+struct  PgQuery__CreateSeqStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *sequence;
@@ -3553,7 +3557,7 @@ struct  _PgQuery__CreateSeqStmt
     , NULL, 0,NULL, 0, 0, 0 }
 
 
-struct  _PgQuery__AlterSeqStmt
+struct  PgQuery__AlterSeqStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *sequence;
@@ -3567,7 +3571,7 @@ struct  _PgQuery__AlterSeqStmt
     , NULL, 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__VariableSetStmt
+struct  PgQuery__VariableSetStmt
 {
   ProtobufCMessage base;
   PgQuery__VariableSetKind kind;
@@ -3581,7 +3585,7 @@ struct  _PgQuery__VariableSetStmt
     , PG_QUERY__VARIABLE_SET_KIND__VARIABLE_SET_KIND_UNDEFINED, (char *)protobuf_c_empty_string, 0,NULL, 0 }
 
 
-struct  _PgQuery__VariableShowStmt
+struct  PgQuery__VariableShowStmt
 {
   ProtobufCMessage base;
   char *name;
@@ -3591,7 +3595,7 @@ struct  _PgQuery__VariableShowStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__DiscardStmt
+struct  PgQuery__DiscardStmt
 {
   ProtobufCMessage base;
   PgQuery__DiscardMode target;
@@ -3601,7 +3605,7 @@ struct  _PgQuery__DiscardStmt
     , PG_QUERY__DISCARD_MODE__DISCARD_MODE_UNDEFINED }
 
 
-struct  _PgQuery__CreateTrigStmt
+struct  PgQuery__CreateTrigStmt
 {
   ProtobufCMessage base;
   char *trigname;
@@ -3628,7 +3632,7 @@ struct  _PgQuery__CreateTrigStmt
     , (char *)protobuf_c_empty_string, NULL, 0,NULL, 0,NULL, 0, 0, 0, 0,NULL, NULL, 0, 0,NULL, 0, 0, NULL }
 
 
-struct  _PgQuery__CreatePLangStmt
+struct  PgQuery__CreatePLangStmt
 {
   ProtobufCMessage base;
   protobuf_c_boolean replace;
@@ -3646,7 +3650,7 @@ struct  _PgQuery__CreatePLangStmt
     , 0, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__CreateRoleStmt
+struct  PgQuery__CreateRoleStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleStmtType stmt_type;
@@ -3659,7 +3663,7 @@ struct  _PgQuery__CreateRoleStmt
     , PG_QUERY__ROLE_STMT_TYPE__ROLE_STMT_TYPE_UNDEFINED, (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__AlterRoleStmt
+struct  PgQuery__AlterRoleStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleSpec *role;
@@ -3672,7 +3676,7 @@ struct  _PgQuery__AlterRoleStmt
     , NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__DropRoleStmt
+struct  PgQuery__DropRoleStmt
 {
   ProtobufCMessage base;
   size_t n_roles;
@@ -3684,7 +3688,7 @@ struct  _PgQuery__DropRoleStmt
     , 0,NULL, 0 }
 
 
-struct  _PgQuery__LockStmt
+struct  PgQuery__LockStmt
 {
   ProtobufCMessage base;
   size_t n_relations;
@@ -3697,7 +3701,7 @@ struct  _PgQuery__LockStmt
     , 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__ConstraintsSetStmt
+struct  PgQuery__ConstraintsSetStmt
 {
   ProtobufCMessage base;
   size_t n_constraints;
@@ -3709,7 +3713,7 @@ struct  _PgQuery__ConstraintsSetStmt
     , 0,NULL, 0 }
 
 
-struct  _PgQuery__ReindexStmt
+struct  PgQuery__ReindexStmt
 {
   ProtobufCMessage base;
   PgQuery__ReindexObjectType kind;
@@ -3723,7 +3727,7 @@ struct  _PgQuery__ReindexStmt
     , PG_QUERY__REINDEX_OBJECT_TYPE__REINDEX_OBJECT_TYPE_UNDEFINED, NULL, (char *)protobuf_c_empty_string, 0, 0 }
 
 
-struct  _PgQuery__CheckPointStmt
+struct  PgQuery__CheckPointStmt
 {
   ProtobufCMessage base;
 };
@@ -3732,7 +3736,7 @@ struct  _PgQuery__CheckPointStmt
      }
 
 
-struct  _PgQuery__CreateSchemaStmt
+struct  PgQuery__CreateSchemaStmt
 {
   ProtobufCMessage base;
   char *schemaname;
@@ -3746,7 +3750,7 @@ struct  _PgQuery__CreateSchemaStmt
     , (char *)protobuf_c_empty_string, NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__AlterDatabaseStmt
+struct  PgQuery__AlterDatabaseStmt
 {
   ProtobufCMessage base;
   char *dbname;
@@ -3758,7 +3762,7 @@ struct  _PgQuery__AlterDatabaseStmt
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__AlterDatabaseSetStmt
+struct  PgQuery__AlterDatabaseSetStmt
 {
   ProtobufCMessage base;
   char *dbname;
@@ -3769,7 +3773,7 @@ struct  _PgQuery__AlterDatabaseSetStmt
     , (char *)protobuf_c_empty_string, NULL }
 
 
-struct  _PgQuery__AlterRoleSetStmt
+struct  PgQuery__AlterRoleSetStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleSpec *role;
@@ -3781,7 +3785,7 @@ struct  _PgQuery__AlterRoleSetStmt
     , NULL, (char *)protobuf_c_empty_string, NULL }
 
 
-struct  _PgQuery__CreateConversionStmt
+struct  PgQuery__CreateConversionStmt
 {
   ProtobufCMessage base;
   size_t n_conversion_name;
@@ -3797,7 +3801,7 @@ struct  _PgQuery__CreateConversionStmt
     , 0,NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0 }
 
 
-struct  _PgQuery__CreateCastStmt
+struct  PgQuery__CreateCastStmt
 {
   ProtobufCMessage base;
   PgQuery__TypeName *sourcetype;
@@ -3811,7 +3815,7 @@ struct  _PgQuery__CreateCastStmt
     , NULL, NULL, NULL, PG_QUERY__COERCION_CONTEXT__COERCION_CONTEXT_UNDEFINED, 0 }
 
 
-struct  _PgQuery__CreateOpClassStmt
+struct  PgQuery__CreateOpClassStmt
 {
   ProtobufCMessage base;
   size_t n_opclassname;
@@ -3829,7 +3833,7 @@ struct  _PgQuery__CreateOpClassStmt
     , 0,NULL, 0,NULL, (char *)protobuf_c_empty_string, NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__CreateOpFamilyStmt
+struct  PgQuery__CreateOpFamilyStmt
 {
   ProtobufCMessage base;
   size_t n_opfamilyname;
@@ -3841,7 +3845,7 @@ struct  _PgQuery__CreateOpFamilyStmt
     , 0,NULL, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__AlterOpFamilyStmt
+struct  PgQuery__AlterOpFamilyStmt
 {
   ProtobufCMessage base;
   size_t n_opfamilyname;
@@ -3856,7 +3860,7 @@ struct  _PgQuery__AlterOpFamilyStmt
     , 0,NULL, (char *)protobuf_c_empty_string, 0, 0,NULL }
 
 
-struct  _PgQuery__PrepareStmt
+struct  PgQuery__PrepareStmt
 {
   ProtobufCMessage base;
   char *name;
@@ -3869,7 +3873,7 @@ struct  _PgQuery__PrepareStmt
     , (char *)protobuf_c_empty_string, 0,NULL, NULL }
 
 
-struct  _PgQuery__ExecuteStmt
+struct  PgQuery__ExecuteStmt
 {
   ProtobufCMessage base;
   char *name;
@@ -3881,7 +3885,7 @@ struct  _PgQuery__ExecuteStmt
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__DeallocateStmt
+struct  PgQuery__DeallocateStmt
 {
   ProtobufCMessage base;
   char *name;
@@ -3891,7 +3895,7 @@ struct  _PgQuery__DeallocateStmt
     , (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__DeclareCursorStmt
+struct  PgQuery__DeclareCursorStmt
 {
   ProtobufCMessage base;
   char *portalname;
@@ -3903,7 +3907,7 @@ struct  _PgQuery__DeclareCursorStmt
     , (char *)protobuf_c_empty_string, 0, NULL }
 
 
-struct  _PgQuery__CreateTableSpaceStmt
+struct  PgQuery__CreateTableSpaceStmt
 {
   ProtobufCMessage base;
   char *tablespacename;
@@ -3917,7 +3921,7 @@ struct  _PgQuery__CreateTableSpaceStmt
     , (char *)protobuf_c_empty_string, NULL, (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__DropTableSpaceStmt
+struct  PgQuery__DropTableSpaceStmt
 {
   ProtobufCMessage base;
   char *tablespacename;
@@ -3928,7 +3932,7 @@ struct  _PgQuery__DropTableSpaceStmt
     , (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__AlterObjectDependsStmt
+struct  PgQuery__AlterObjectDependsStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType object_type;
@@ -3942,7 +3946,7 @@ struct  _PgQuery__AlterObjectDependsStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, NULL, NULL, 0 }
 
 
-struct  _PgQuery__AlterObjectSchemaStmt
+struct  PgQuery__AlterObjectSchemaStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType object_type;
@@ -3956,7 +3960,7 @@ struct  _PgQuery__AlterObjectSchemaStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__AlterOwnerStmt
+struct  PgQuery__AlterOwnerStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType object_type;
@@ -3969,7 +3973,7 @@ struct  _PgQuery__AlterOwnerStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, NULL, NULL }
 
 
-struct  _PgQuery__AlterOperatorStmt
+struct  PgQuery__AlterOperatorStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectWithArgs *opername;
@@ -3981,7 +3985,7 @@ struct  _PgQuery__AlterOperatorStmt
     , NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterTypeStmt
+struct  PgQuery__AlterTypeStmt
 {
   ProtobufCMessage base;
   size_t n_type_name;
@@ -3994,7 +3998,7 @@ struct  _PgQuery__AlterTypeStmt
     , 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__DropOwnedStmt
+struct  PgQuery__DropOwnedStmt
 {
   ProtobufCMessage base;
   size_t n_roles;
@@ -4006,7 +4010,7 @@ struct  _PgQuery__DropOwnedStmt
     , 0,NULL, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED }
 
 
-struct  _PgQuery__ReassignOwnedStmt
+struct  PgQuery__ReassignOwnedStmt
 {
   ProtobufCMessage base;
   size_t n_roles;
@@ -4018,7 +4022,7 @@ struct  _PgQuery__ReassignOwnedStmt
     , 0,NULL, NULL }
 
 
-struct  _PgQuery__CompositeTypeStmt
+struct  PgQuery__CompositeTypeStmt
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *typevar;
@@ -4030,7 +4034,7 @@ struct  _PgQuery__CompositeTypeStmt
     , NULL, 0,NULL }
 
 
-struct  _PgQuery__CreateEnumStmt
+struct  PgQuery__CreateEnumStmt
 {
   ProtobufCMessage base;
   size_t n_type_name;
@@ -4043,7 +4047,7 @@ struct  _PgQuery__CreateEnumStmt
     , 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__CreateRangeStmt
+struct  PgQuery__CreateRangeStmt
 {
   ProtobufCMessage base;
   size_t n_type_name;
@@ -4056,7 +4060,7 @@ struct  _PgQuery__CreateRangeStmt
     , 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterEnumStmt
+struct  PgQuery__AlterEnumStmt
 {
   ProtobufCMessage base;
   size_t n_type_name;
@@ -4072,7 +4076,7 @@ struct  _PgQuery__AlterEnumStmt
     , 0,NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0, 0 }
 
 
-struct  _PgQuery__AlterTSDictionaryStmt
+struct  PgQuery__AlterTSDictionaryStmt
 {
   ProtobufCMessage base;
   size_t n_dictname;
@@ -4085,7 +4089,7 @@ struct  _PgQuery__AlterTSDictionaryStmt
     , 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterTSConfigurationStmt
+struct  PgQuery__AlterTSConfigurationStmt
 {
   ProtobufCMessage base;
   PgQuery__AlterTSConfigType kind;
@@ -4104,7 +4108,7 @@ struct  _PgQuery__AlterTSConfigurationStmt
     , PG_QUERY__ALTER_TSCONFIG_TYPE__ALTER_TSCONFIG_TYPE_UNDEFINED, 0,NULL, 0,NULL, 0,NULL, 0, 0, 0 }
 
 
-struct  _PgQuery__CreateFdwStmt
+struct  PgQuery__CreateFdwStmt
 {
   ProtobufCMessage base;
   char *fdwname;
@@ -4118,7 +4122,7 @@ struct  _PgQuery__CreateFdwStmt
     , (char *)protobuf_c_empty_string, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterFdwStmt
+struct  PgQuery__AlterFdwStmt
 {
   ProtobufCMessage base;
   char *fdwname;
@@ -4132,7 +4136,7 @@ struct  _PgQuery__AlterFdwStmt
     , (char *)protobuf_c_empty_string, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__CreateForeignServerStmt
+struct  PgQuery__CreateForeignServerStmt
 {
   ProtobufCMessage base;
   char *servername;
@@ -4148,7 +4152,7 @@ struct  _PgQuery__CreateForeignServerStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0, 0,NULL }
 
 
-struct  _PgQuery__AlterForeignServerStmt
+struct  PgQuery__AlterForeignServerStmt
 {
   ProtobufCMessage base;
   char *servername;
@@ -4162,7 +4166,7 @@ struct  _PgQuery__AlterForeignServerStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0 }
 
 
-struct  _PgQuery__CreateUserMappingStmt
+struct  PgQuery__CreateUserMappingStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleSpec *user;
@@ -4176,7 +4180,7 @@ struct  _PgQuery__CreateUserMappingStmt
     , NULL, (char *)protobuf_c_empty_string, 0, 0,NULL }
 
 
-struct  _PgQuery__AlterUserMappingStmt
+struct  PgQuery__AlterUserMappingStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleSpec *user;
@@ -4189,7 +4193,7 @@ struct  _PgQuery__AlterUserMappingStmt
     , NULL, (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__DropUserMappingStmt
+struct  PgQuery__DropUserMappingStmt
 {
   ProtobufCMessage base;
   PgQuery__RoleSpec *user;
@@ -4201,7 +4205,7 @@ struct  _PgQuery__DropUserMappingStmt
     , NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__AlterTableSpaceOptionsStmt
+struct  PgQuery__AlterTableSpaceOptionsStmt
 {
   ProtobufCMessage base;
   char *tablespacename;
@@ -4214,7 +4218,7 @@ struct  _PgQuery__AlterTableSpaceOptionsStmt
     , (char *)protobuf_c_empty_string, 0,NULL, 0 }
 
 
-struct  _PgQuery__AlterTableMoveAllStmt
+struct  PgQuery__AlterTableMoveAllStmt
 {
   ProtobufCMessage base;
   char *orig_tablespacename;
@@ -4229,7 +4233,7 @@ struct  _PgQuery__AlterTableMoveAllStmt
     , (char *)protobuf_c_empty_string, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, 0,NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__SecLabelStmt
+struct  PgQuery__SecLabelStmt
 {
   ProtobufCMessage base;
   PgQuery__ObjectType objtype;
@@ -4242,7 +4246,7 @@ struct  _PgQuery__SecLabelStmt
     , PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__CreateForeignTableStmt
+struct  PgQuery__CreateForeignTableStmt
 {
   ProtobufCMessage base;
   PgQuery__CreateStmt *base_stmt;
@@ -4255,7 +4259,7 @@ struct  _PgQuery__CreateForeignTableStmt
     , NULL, (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__ImportForeignSchemaStmt
+struct  PgQuery__ImportForeignSchemaStmt
 {
   ProtobufCMessage base;
   char *server_name;
@@ -4272,7 +4276,7 @@ struct  _PgQuery__ImportForeignSchemaStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, PG_QUERY__IMPORT_FOREIGN_SCHEMA_TYPE__IMPORT_FOREIGN_SCHEMA_TYPE_UNDEFINED, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__CreateExtensionStmt
+struct  PgQuery__CreateExtensionStmt
 {
   ProtobufCMessage base;
   char *extname;
@@ -4285,7 +4289,7 @@ struct  _PgQuery__CreateExtensionStmt
     , (char *)protobuf_c_empty_string, 0, 0,NULL }
 
 
-struct  _PgQuery__AlterExtensionStmt
+struct  PgQuery__AlterExtensionStmt
 {
   ProtobufCMessage base;
   char *extname;
@@ -4297,7 +4301,7 @@ struct  _PgQuery__AlterExtensionStmt
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__AlterExtensionContentsStmt
+struct  PgQuery__AlterExtensionContentsStmt
 {
   ProtobufCMessage base;
   char *extname;
@@ -4310,7 +4314,7 @@ struct  _PgQuery__AlterExtensionContentsStmt
     , (char *)protobuf_c_empty_string, 0, PG_QUERY__OBJECT_TYPE__OBJECT_TYPE_UNDEFINED, NULL }
 
 
-struct  _PgQuery__CreateEventTrigStmt
+struct  PgQuery__CreateEventTrigStmt
 {
   ProtobufCMessage base;
   char *trigname;
@@ -4325,7 +4329,7 @@ struct  _PgQuery__CreateEventTrigStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterEventTrigStmt
+struct  PgQuery__AlterEventTrigStmt
 {
   ProtobufCMessage base;
   char *trigname;
@@ -4336,7 +4340,7 @@ struct  _PgQuery__AlterEventTrigStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__RefreshMatViewStmt
+struct  PgQuery__RefreshMatViewStmt
 {
   ProtobufCMessage base;
   protobuf_c_boolean concurrent;
@@ -4348,7 +4352,7 @@ struct  _PgQuery__RefreshMatViewStmt
     , 0, 0, NULL }
 
 
-struct  _PgQuery__ReplicaIdentityStmt
+struct  PgQuery__ReplicaIdentityStmt
 {
   ProtobufCMessage base;
   char *identity_type;
@@ -4359,7 +4363,7 @@ struct  _PgQuery__ReplicaIdentityStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__AlterSystemStmt
+struct  PgQuery__AlterSystemStmt
 {
   ProtobufCMessage base;
   PgQuery__VariableSetStmt *setstmt;
@@ -4369,7 +4373,7 @@ struct  _PgQuery__AlterSystemStmt
     , NULL }
 
 
-struct  _PgQuery__CreatePolicyStmt
+struct  PgQuery__CreatePolicyStmt
 {
   ProtobufCMessage base;
   char *policy_name;
@@ -4386,7 +4390,7 @@ struct  _PgQuery__CreatePolicyStmt
     , (char *)protobuf_c_empty_string, NULL, (char *)protobuf_c_empty_string, 0, 0,NULL, NULL, NULL }
 
 
-struct  _PgQuery__AlterPolicyStmt
+struct  PgQuery__AlterPolicyStmt
 {
   ProtobufCMessage base;
   char *policy_name;
@@ -4401,7 +4405,7 @@ struct  _PgQuery__AlterPolicyStmt
     , (char *)protobuf_c_empty_string, NULL, 0,NULL, NULL, NULL }
 
 
-struct  _PgQuery__CreateTransformStmt
+struct  PgQuery__CreateTransformStmt
 {
   ProtobufCMessage base;
   protobuf_c_boolean replace;
@@ -4415,7 +4419,7 @@ struct  _PgQuery__CreateTransformStmt
     , 0, NULL, (char *)protobuf_c_empty_string, NULL, NULL }
 
 
-struct  _PgQuery__CreateAmStmt
+struct  PgQuery__CreateAmStmt
 {
   ProtobufCMessage base;
   char *amname;
@@ -4428,7 +4432,7 @@ struct  _PgQuery__CreateAmStmt
     , (char *)protobuf_c_empty_string, 0,NULL, (char *)protobuf_c_empty_string }
 
 
-struct  _PgQuery__CreatePublicationStmt
+struct  PgQuery__CreatePublicationStmt
 {
   ProtobufCMessage base;
   char *pubname;
@@ -4443,7 +4447,7 @@ struct  _PgQuery__CreatePublicationStmt
     , (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__AlterPublicationStmt
+struct  PgQuery__AlterPublicationStmt
 {
   ProtobufCMessage base;
   char *pubname;
@@ -4459,7 +4463,7 @@ struct  _PgQuery__AlterPublicationStmt
     , (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0, PG_QUERY__DEF_ELEM_ACTION__DEF_ELEM_ACTION_UNDEFINED }
 
 
-struct  _PgQuery__CreateSubscriptionStmt
+struct  PgQuery__CreateSubscriptionStmt
 {
   ProtobufCMessage base;
   char *subname;
@@ -4474,7 +4478,7 @@ struct  _PgQuery__CreateSubscriptionStmt
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__AlterSubscriptionStmt
+struct  PgQuery__AlterSubscriptionStmt
 {
   ProtobufCMessage base;
   PgQuery__AlterSubscriptionType kind;
@@ -4490,7 +4494,7 @@ struct  _PgQuery__AlterSubscriptionStmt
     , PG_QUERY__ALTER_SUBSCRIPTION_TYPE__ALTER_SUBSCRIPTION_TYPE_UNDEFINED, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__DropSubscriptionStmt
+struct  PgQuery__DropSubscriptionStmt
 {
   ProtobufCMessage base;
   char *subname;
@@ -4502,7 +4506,7 @@ struct  _PgQuery__DropSubscriptionStmt
     , (char *)protobuf_c_empty_string, 0, PG_QUERY__DROP_BEHAVIOR__DROP_BEHAVIOR_UNDEFINED }
 
 
-struct  _PgQuery__CreateStatsStmt
+struct  PgQuery__CreateStatsStmt
 {
   ProtobufCMessage base;
   size_t n_defnames;
@@ -4521,7 +4525,7 @@ struct  _PgQuery__CreateStatsStmt
     , 0,NULL, 0,NULL, 0,NULL, 0,NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__AlterCollationStmt
+struct  PgQuery__AlterCollationStmt
 {
   ProtobufCMessage base;
   size_t n_collname;
@@ -4532,7 +4536,7 @@ struct  _PgQuery__AlterCollationStmt
     , 0,NULL }
 
 
-struct  _PgQuery__CallStmt
+struct  PgQuery__CallStmt
 {
   ProtobufCMessage base;
   PgQuery__FuncCall *funccall;
@@ -4543,7 +4547,7 @@ struct  _PgQuery__CallStmt
     , NULL, NULL }
 
 
-struct  _PgQuery__AlterStatsStmt
+struct  PgQuery__AlterStatsStmt
 {
   ProtobufCMessage base;
   size_t n_defnames;
@@ -4556,7 +4560,7 @@ struct  _PgQuery__AlterStatsStmt
     , 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__AExpr
+struct  PgQuery__AExpr
 {
   ProtobufCMessage base;
   PgQuery__AExprKind kind;
@@ -4571,7 +4575,7 @@ struct  _PgQuery__AExpr
     , PG_QUERY__A__EXPR__KIND__A_EXPR_KIND_UNDEFINED, 0,NULL, NULL, NULL, 0 }
 
 
-struct  _PgQuery__ColumnRef
+struct  PgQuery__ColumnRef
 {
   ProtobufCMessage base;
   size_t n_fields;
@@ -4583,7 +4587,7 @@ struct  _PgQuery__ColumnRef
     , 0,NULL, 0 }
 
 
-struct  _PgQuery__ParamRef
+struct  PgQuery__ParamRef
 {
   ProtobufCMessage base;
   int32_t number;
@@ -4594,7 +4598,7 @@ struct  _PgQuery__ParamRef
     , 0, 0 }
 
 
-struct  _PgQuery__AConst
+struct  PgQuery__AConst
 {
   ProtobufCMessage base;
   PgQuery__Node *val;
@@ -4605,7 +4609,7 @@ struct  _PgQuery__AConst
     , NULL, 0 }
 
 
-struct  _PgQuery__FuncCall
+struct  PgQuery__FuncCall
 {
   ProtobufCMessage base;
   size_t n_funcname;
@@ -4627,7 +4631,7 @@ struct  _PgQuery__FuncCall
     , 0,NULL, 0,NULL, 0,NULL, NULL, 0, 0, 0, 0, NULL, 0 }
 
 
-struct  _PgQuery__AStar
+struct  PgQuery__AStar
 {
   ProtobufCMessage base;
 };
@@ -4636,7 +4640,7 @@ struct  _PgQuery__AStar
      }
 
 
-struct  _PgQuery__AIndices
+struct  PgQuery__AIndices
 {
   ProtobufCMessage base;
   protobuf_c_boolean is_slice;
@@ -4648,7 +4652,7 @@ struct  _PgQuery__AIndices
     , 0, NULL, NULL }
 
 
-struct  _PgQuery__AIndirection
+struct  PgQuery__AIndirection
 {
   ProtobufCMessage base;
   PgQuery__Node *arg;
@@ -4660,7 +4664,7 @@ struct  _PgQuery__AIndirection
     , NULL, 0,NULL }
 
 
-struct  _PgQuery__AArrayExpr
+struct  PgQuery__AArrayExpr
 {
   ProtobufCMessage base;
   size_t n_elements;
@@ -4672,7 +4676,7 @@ struct  _PgQuery__AArrayExpr
     , 0,NULL, 0 }
 
 
-struct  _PgQuery__ResTarget
+struct  PgQuery__ResTarget
 {
   ProtobufCMessage base;
   char *name;
@@ -4686,7 +4690,7 @@ struct  _PgQuery__ResTarget
     , (char *)protobuf_c_empty_string, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__MultiAssignRef
+struct  PgQuery__MultiAssignRef
 {
   ProtobufCMessage base;
   PgQuery__Node *source;
@@ -4698,7 +4702,7 @@ struct  _PgQuery__MultiAssignRef
     , NULL, 0, 0 }
 
 
-struct  _PgQuery__TypeCast
+struct  PgQuery__TypeCast
 {
   ProtobufCMessage base;
   PgQuery__Node *arg;
@@ -4710,7 +4714,7 @@ struct  _PgQuery__TypeCast
     , NULL, NULL, 0 }
 
 
-struct  _PgQuery__CollateClause
+struct  PgQuery__CollateClause
 {
   ProtobufCMessage base;
   PgQuery__Node *arg;
@@ -4723,7 +4727,7 @@ struct  _PgQuery__CollateClause
     , NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__SortBy
+struct  PgQuery__SortBy
 {
   ProtobufCMessage base;
   PgQuery__Node *node;
@@ -4738,7 +4742,7 @@ struct  _PgQuery__SortBy
     , NULL, PG_QUERY__SORT_BY_DIR__SORT_BY_DIR_UNDEFINED, PG_QUERY__SORT_BY_NULLS__SORT_BY_NULLS_UNDEFINED, 0,NULL, 0 }
 
 
-struct  _PgQuery__WindowDef
+struct  PgQuery__WindowDef
 {
   ProtobufCMessage base;
   char *name;
@@ -4757,7 +4761,7 @@ struct  _PgQuery__WindowDef
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0, NULL, NULL, 0 }
 
 
-struct  _PgQuery__RangeSubselect
+struct  PgQuery__RangeSubselect
 {
   ProtobufCMessage base;
   protobuf_c_boolean lateral;
@@ -4769,7 +4773,7 @@ struct  _PgQuery__RangeSubselect
     , 0, NULL, NULL }
 
 
-struct  _PgQuery__RangeFunction
+struct  PgQuery__RangeFunction
 {
   ProtobufCMessage base;
   protobuf_c_boolean lateral;
@@ -4786,7 +4790,7 @@ struct  _PgQuery__RangeFunction
     , 0, 0, 0, 0,NULL, NULL, 0,NULL }
 
 
-struct  _PgQuery__RangeTableSample
+struct  PgQuery__RangeTableSample
 {
   ProtobufCMessage base;
   PgQuery__Node *relation;
@@ -4802,7 +4806,7 @@ struct  _PgQuery__RangeTableSample
     , NULL, 0,NULL, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__RangeTableFunc
+struct  PgQuery__RangeTableFunc
 {
   ProtobufCMessage base;
   protobuf_c_boolean lateral;
@@ -4820,7 +4824,7 @@ struct  _PgQuery__RangeTableFunc
     , 0, NULL, NULL, 0,NULL, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__RangeTableFuncCol
+struct  PgQuery__RangeTableFuncCol
 {
   ProtobufCMessage base;
   char *colname;
@@ -4836,7 +4840,7 @@ struct  _PgQuery__RangeTableFuncCol
     , (char *)protobuf_c_empty_string, NULL, 0, 0, NULL, NULL, 0 }
 
 
-struct  _PgQuery__TypeName
+struct  PgQuery__TypeName
 {
   ProtobufCMessage base;
   size_t n_names;
@@ -4856,7 +4860,7 @@ struct  _PgQuery__TypeName
     , 0,NULL, 0, 0, 0, 0,NULL, 0, 0,NULL, 0 }
 
 
-struct  _PgQuery__ColumnDef
+struct  PgQuery__ColumnDef
 {
   ProtobufCMessage base;
   char *colname;
@@ -4884,7 +4888,7 @@ struct  _PgQuery__ColumnDef
     , (char *)protobuf_c_empty_string, NULL, 0, 0, 0, 0, (char *)protobuf_c_empty_string, NULL, NULL, (char *)protobuf_c_empty_string, NULL, (char *)protobuf_c_empty_string, NULL, 0, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__IndexElem
+struct  PgQuery__IndexElem
 {
   ProtobufCMessage base;
   char *name;
@@ -4904,7 +4908,7 @@ struct  _PgQuery__IndexElem
     , (char *)protobuf_c_empty_string, NULL, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0,NULL, PG_QUERY__SORT_BY_DIR__SORT_BY_DIR_UNDEFINED, PG_QUERY__SORT_BY_NULLS__SORT_BY_NULLS_UNDEFINED }
 
 
-struct  _PgQuery__Constraint
+struct  PgQuery__Constraint
 {
   ProtobufCMessage base;
   PgQuery__ConstrType contype;
@@ -4948,7 +4952,7 @@ struct  _PgQuery__Constraint
     , PG_QUERY__CONSTR_TYPE__CONSTR_TYPE_UNDEFINED, (char *)protobuf_c_empty_string, 0, 0, 0, 0, NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0,NULL, 0,NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0, (char *)protobuf_c_empty_string, NULL, NULL, 0,NULL, 0,NULL, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0, 0, 0 }
 
 
-struct  _PgQuery__DefElem
+struct  PgQuery__DefElem
 {
   ProtobufCMessage base;
   char *defnamespace;
@@ -4962,7 +4966,7 @@ struct  _PgQuery__DefElem
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, NULL, PG_QUERY__DEF_ELEM_ACTION__DEF_ELEM_ACTION_UNDEFINED, 0 }
 
 
-struct  _PgQuery__RangeTblEntry
+struct  PgQuery__RangeTblEntry
 {
   ProtobufCMessage base;
   PgQuery__RTEKind rtekind;
@@ -5020,7 +5024,7 @@ struct  _PgQuery__RangeTblEntry
     , PG_QUERY__RTEKIND__RTEKIND_UNDEFINED, 0, (char *)protobuf_c_empty_string, 0, NULL, NULL, 0, PG_QUERY__JOIN_TYPE__JOIN_TYPE_UNDEFINED, 0, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0, NULL, 0,NULL, (char *)protobuf_c_empty_string, 0, 0, 0,NULL, 0,NULL, 0,NULL, (char *)protobuf_c_empty_string, 0, NULL, NULL, 0, 0, 0, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__RangeTblFunction
+struct  PgQuery__RangeTblFunction
 {
   ProtobufCMessage base;
   PgQuery__Node *funcexpr;
@@ -5041,7 +5045,7 @@ struct  _PgQuery__RangeTblFunction
     , NULL, 0, 0,NULL, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__TableSampleClause
+struct  PgQuery__TableSampleClause
 {
   ProtobufCMessage base;
   uint32_t tsmhandler;
@@ -5054,7 +5058,7 @@ struct  _PgQuery__TableSampleClause
     , 0, 0,NULL, NULL }
 
 
-struct  _PgQuery__WithCheckOption
+struct  PgQuery__WithCheckOption
 {
   ProtobufCMessage base;
   PgQuery__WCOKind kind;
@@ -5068,7 +5072,7 @@ struct  _PgQuery__WithCheckOption
     , PG_QUERY__WCOKIND__WCOKIND_UNDEFINED, (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, NULL, 0 }
 
 
-struct  _PgQuery__SortGroupClause
+struct  PgQuery__SortGroupClause
 {
   ProtobufCMessage base;
   uint32_t tle_sort_group_ref;
@@ -5082,7 +5086,7 @@ struct  _PgQuery__SortGroupClause
     , 0, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__GroupingSet
+struct  PgQuery__GroupingSet
 {
   ProtobufCMessage base;
   PgQuery__GroupingSetKind kind;
@@ -5095,7 +5099,7 @@ struct  _PgQuery__GroupingSet
     , PG_QUERY__GROUPING_SET_KIND__GROUPING_SET_KIND_UNDEFINED, 0,NULL, 0 }
 
 
-struct  _PgQuery__WindowClause
+struct  PgQuery__WindowClause
 {
   ProtobufCMessage base;
   char *name;
@@ -5120,7 +5124,7 @@ struct  _PgQuery__WindowClause
     , (char *)protobuf_c_empty_string, (char *)protobuf_c_empty_string, 0,NULL, 0,NULL, 0, NULL, NULL, 0, 0, 0, 0, 0, 0, 0 }
 
 
-struct  _PgQuery__ObjectWithArgs
+struct  PgQuery__ObjectWithArgs
 {
   ProtobufCMessage base;
   size_t n_objname;
@@ -5134,7 +5138,7 @@ struct  _PgQuery__ObjectWithArgs
     , 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__AccessPriv
+struct  PgQuery__AccessPriv
 {
   ProtobufCMessage base;
   char *priv_name;
@@ -5146,7 +5150,7 @@ struct  _PgQuery__AccessPriv
     , (char *)protobuf_c_empty_string, 0,NULL }
 
 
-struct  _PgQuery__CreateOpClassItem
+struct  PgQuery__CreateOpClassItem
 {
   ProtobufCMessage base;
   int32_t itemtype;
@@ -5163,18 +5167,19 @@ struct  _PgQuery__CreateOpClassItem
     , 0, NULL, 0, 0,NULL, 0,NULL, NULL }
 
 
-struct  _PgQuery__TableLikeClause
+struct  PgQuery__TableLikeClause
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
   uint32_t options;
+  uint32_t relation_oid;
 };
 #define PG_QUERY__TABLE_LIKE_CLAUSE__INIT \
  { PROTOBUF_C_MESSAGE_INIT (&pg_query__table_like_clause__descriptor) \
-    , NULL, 0 }
+    , NULL, 0, 0 }
 
 
-struct  _PgQuery__FunctionParameter
+struct  PgQuery__FunctionParameter
 {
   ProtobufCMessage base;
   char *name;
@@ -5187,7 +5192,7 @@ struct  _PgQuery__FunctionParameter
     , (char *)protobuf_c_empty_string, NULL, PG_QUERY__FUNCTION_PARAMETER_MODE__FUNCTION_PARAMETER_MODE_UNDEFINED, NULL }
 
 
-struct  _PgQuery__LockingClause
+struct  PgQuery__LockingClause
 {
   ProtobufCMessage base;
   size_t n_locked_rels;
@@ -5200,7 +5205,7 @@ struct  _PgQuery__LockingClause
     , 0,NULL, PG_QUERY__LOCK_CLAUSE_STRENGTH__LOCK_CLAUSE_STRENGTH_UNDEFINED, PG_QUERY__LOCK_WAIT_POLICY__LOCK_WAIT_POLICY_UNDEFINED }
 
 
-struct  _PgQuery__RowMarkClause
+struct  PgQuery__RowMarkClause
 {
   ProtobufCMessage base;
   uint32_t rti;
@@ -5213,7 +5218,7 @@ struct  _PgQuery__RowMarkClause
     , 0, PG_QUERY__LOCK_CLAUSE_STRENGTH__LOCK_CLAUSE_STRENGTH_UNDEFINED, PG_QUERY__LOCK_WAIT_POLICY__LOCK_WAIT_POLICY_UNDEFINED, 0 }
 
 
-struct  _PgQuery__XmlSerialize
+struct  PgQuery__XmlSerialize
 {
   ProtobufCMessage base;
   PgQuery__XmlOptionType xmloption;
@@ -5226,7 +5231,7 @@ struct  _PgQuery__XmlSerialize
     , PG_QUERY__XML_OPTION_TYPE__XML_OPTION_TYPE_UNDEFINED, NULL, NULL, 0 }
 
 
-struct  _PgQuery__WithClause
+struct  PgQuery__WithClause
 {
   ProtobufCMessage base;
   size_t n_ctes;
@@ -5239,7 +5244,7 @@ struct  _PgQuery__WithClause
     , 0,NULL, 0, 0 }
 
 
-struct  _PgQuery__InferClause
+struct  PgQuery__InferClause
 {
   ProtobufCMessage base;
   size_t n_index_elems;
@@ -5253,7 +5258,7 @@ struct  _PgQuery__InferClause
     , 0,NULL, NULL, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__OnConflictClause
+struct  PgQuery__OnConflictClause
 {
   ProtobufCMessage base;
   PgQuery__OnConflictAction action;
@@ -5268,7 +5273,7 @@ struct  _PgQuery__OnConflictClause
     , PG_QUERY__ON_CONFLICT_ACTION__ON_CONFLICT_ACTION_UNDEFINED, NULL, 0,NULL, NULL, 0 }
 
 
-struct  _PgQuery__CommonTableExpr
+struct  PgQuery__CommonTableExpr
 {
   ProtobufCMessage base;
   char *ctename;
@@ -5293,7 +5298,7 @@ struct  _PgQuery__CommonTableExpr
     , (char *)protobuf_c_empty_string, 0,NULL, PG_QUERY__CTEMATERIALIZE__CTEMATERIALIZE_UNDEFINED, NULL, 0, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0,NULL }
 
 
-struct  _PgQuery__RoleSpec
+struct  PgQuery__RoleSpec
 {
   ProtobufCMessage base;
   PgQuery__RoleSpecType roletype;
@@ -5305,7 +5310,7 @@ struct  _PgQuery__RoleSpec
     , PG_QUERY__ROLE_SPEC_TYPE__ROLE_SPEC_TYPE_UNDEFINED, (char *)protobuf_c_empty_string, 0 }
 
 
-struct  _PgQuery__TriggerTransition
+struct  PgQuery__TriggerTransition
 {
   ProtobufCMessage base;
   char *name;
@@ -5317,7 +5322,7 @@ struct  _PgQuery__TriggerTransition
     , (char *)protobuf_c_empty_string, 0, 0 }
 
 
-struct  _PgQuery__PartitionElem
+struct  PgQuery__PartitionElem
 {
   ProtobufCMessage base;
   char *name;
@@ -5333,7 +5338,7 @@ struct  _PgQuery__PartitionElem
     , (char *)protobuf_c_empty_string, NULL, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__PartitionSpec
+struct  PgQuery__PartitionSpec
 {
   ProtobufCMessage base;
   char *strategy;
@@ -5346,7 +5351,7 @@ struct  _PgQuery__PartitionSpec
     , (char *)protobuf_c_empty_string, 0,NULL, 0 }
 
 
-struct  _PgQuery__PartitionBoundSpec
+struct  PgQuery__PartitionBoundSpec
 {
   ProtobufCMessage base;
   char *strategy;
@@ -5366,7 +5371,7 @@ struct  _PgQuery__PartitionBoundSpec
     , (char *)protobuf_c_empty_string, 0, 0, 0, 0,NULL, 0,NULL, 0,NULL, 0 }
 
 
-struct  _PgQuery__PartitionRangeDatum
+struct  PgQuery__PartitionRangeDatum
 {
   ProtobufCMessage base;
   PgQuery__PartitionRangeDatumKind kind;
@@ -5378,7 +5383,7 @@ struct  _PgQuery__PartitionRangeDatum
     , PG_QUERY__PARTITION_RANGE_DATUM_KIND__PARTITION_RANGE_DATUM_KIND_UNDEFINED, NULL, 0 }
 
 
-struct  _PgQuery__PartitionCmd
+struct  PgQuery__PartitionCmd
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *name;
@@ -5389,7 +5394,7 @@ struct  _PgQuery__PartitionCmd
     , NULL, NULL }
 
 
-struct  _PgQuery__VacuumRelation
+struct  PgQuery__VacuumRelation
 {
   ProtobufCMessage base;
   PgQuery__RangeVar *relation;
@@ -5402,7 +5407,7 @@ struct  _PgQuery__VacuumRelation
     , NULL, 0, 0,NULL }
 
 
-struct  _PgQuery__InlineCodeBlock
+struct  PgQuery__InlineCodeBlock
 {
   ProtobufCMessage base;
   char *source_text;
@@ -5415,7 +5420,7 @@ struct  _PgQuery__InlineCodeBlock
     , (char *)protobuf_c_empty_string, 0, 0, 0 }
 
 
-struct  _PgQuery__CallContext
+struct  PgQuery__CallContext
 {
   ProtobufCMessage base;
   protobuf_c_boolean atomic;
@@ -5425,7 +5430,7 @@ struct  _PgQuery__CallContext
     , 0 }
 
 
-struct  _PgQuery__ScanToken
+struct  PgQuery__ScanToken
 {
   ProtobufCMessage base;
   int32_t start;