pg_query 4.2.2 → 5.0.0

data/lib/pg_query/treewalker.rb

@@ -20,13 +20,18 @@ module PgQuery
             node = parent_node[parent_field.to_s]
             next if node.nil?
             location = parent_location + [parent_field]
-
             yield(parent_node, parent_field, node, location) if node.is_a?(Google::Protobuf::MessageExts) || node.is_a?(Google::Protobuf::RepeatedField)
 
             nodes << [node, location] unless node.nil?
           end
         when Google::Protobuf::RepeatedField
-          nodes += parent_node.map.with_index { |e, idx| [e, parent_location + [idx]] }
+          parent_node.each_with_index do |node, parent_field|
+            next if node.nil?
+            location = parent_location + [parent_field]
+            yield(parent_node, parent_field, node, location) if node.is_a?(Google::Protobuf::MessageExts) || node.is_a?(Google::Protobuf::RepeatedField)
+
+            nodes << [node, location] unless node.nil?
+          end
         end
 
         break if nodes.empty?

data/lib/pg_query/version.rb

@@ -1,3 +1,3 @@
 module PgQuery
-  VERSION = '4.2.2'.freeze
+  VERSION = '5.0.0'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: pg_query
 version: !ruby/object:Gem::Version
-  version: 4.2.2
+  version: 5.0.0
 platform: ruby
 authors:
 - Lukas Fittl
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-04 00:00:00.000000000 Z
+date: 2023-12-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rake-compiler
@@ -120,6 +120,7 @@ files:
 - ext/pg_query/include/access/tableam.h
 - ext/pg_query/include/access/toast_compression.h
 - ext/pg_query/include/access/transam.h
+- ext/pg_query/include/access/tsmapi.h
 - ext/pg_query/include/access/tupconvert.h
 - ext/pg_query/include/access/tupdesc.h
 - ext/pg_query/include/access/tupmacs.h
@@ -127,11 +128,13 @@ files:
 - ext/pg_query/include/access/xact.h
 - ext/pg_query/include/access/xlog.h
 - ext/pg_query/include/access/xlog_internal.h
+- ext/pg_query/include/access/xlogbackup.h
 - ext/pg_query/include/access/xlogdefs.h
 - ext/pg_query/include/access/xlogprefetcher.h
 - ext/pg_query/include/access/xlogreader.h
 - ext/pg_query/include/access/xlogrecord.h
 - ext/pg_query/include/access/xlogrecovery.h
+- ext/pg_query/include/archive/archive_module.h
 - ext/pg_query/include/c.h
 - ext/pg_query/include/catalog/catalog.h
 - ext/pg_query/include/catalog/catversion.h
@@ -159,6 +162,8 @@ files:
 - ext/pg_query/include/catalog/pg_control.h
 - ext/pg_query/include/catalog/pg_conversion.h
 - ext/pg_query/include/catalog/pg_conversion_d.h
+- ext/pg_query/include/catalog/pg_database.h
+- ext/pg_query/include/catalog/pg_database_d.h
 - ext/pg_query/include/catalog/pg_depend.h
 - ext/pg_query/include/catalog/pg_depend_d.h
 - ext/pg_query/include/catalog/pg_event_trigger.h
@@ -175,8 +180,6 @@ files:
 - ext/pg_query/include/catalog/pg_operator_d.h
 - ext/pg_query/include/catalog/pg_opfamily.h
 - ext/pg_query/include/catalog/pg_opfamily_d.h
-- ext/pg_query/include/catalog/pg_parameter_acl.h
-- ext/pg_query/include/catalog/pg_parameter_acl_d.h
 - ext/pg_query/include/catalog/pg_partitioned_table.h
 - ext/pg_query/include/catalog/pg_partitioned_table_d.h
 - ext/pg_query/include/catalog/pg_proc.h
@@ -214,18 +217,25 @@ files:
 - ext/pg_query/include/commands/trigger.h
 - ext/pg_query/include/commands/user.h
 - ext/pg_query/include/commands/vacuum.h
-- ext/pg_query/include/commands/variable.h
+- ext/pg_query/include/common/cryptohash.h
 - ext/pg_query/include/common/file_perm.h
 - ext/pg_query/include/common/hashfn.h
+- ext/pg_query/include/common/int.h
 - ext/pg_query/include/common/ip.h
 - ext/pg_query/include/common/keywords.h
 - ext/pg_query/include/common/kwlookup.h
 - ext/pg_query/include/common/pg_prng.h
 - ext/pg_query/include/common/relpath.h
+- ext/pg_query/include/common/scram-common.h
+- ext/pg_query/include/common/sha2.h
 - ext/pg_query/include/common/string.h
-- ext/pg_query/include/common/unicode_combining_table.h
 - ext/pg_query/include/common/unicode_east_asian_fw_table.h
+- ext/pg_query/include/common/unicode_nonspacing_table.h
+- ext/pg_query/include/copyfuncs.funcs.c
+- ext/pg_query/include/copyfuncs.switch.c
 - ext/pg_query/include/datatype/timestamp.h
+- ext/pg_query/include/equalfuncs.funcs.c
+- ext/pg_query/include/equalfuncs.switch.c
 - ext/pg_query/include/executor/execdesc.h
 - ext/pg_query/include/executor/executor.h
 - ext/pg_query/include/executor/functions.h
@@ -234,8 +244,10 @@ files:
 - ext/pg_query/include/executor/tablefunc.h
 - ext/pg_query/include/executor/tuptable.h
 - ext/pg_query/include/fmgr.h
+- ext/pg_query/include/foreign/fdwapi.h
 - ext/pg_query/include/funcapi.h
-- ext/pg_query/include/getaddrinfo.h
+- ext/pg_query/include/gram.h
+- ext/pg_query/include/gramparse.h
 - ext/pg_query/include/jit/jit.h
 - ext/pg_query/include/kwlist_d.h
 - ext/pg_query/include/lib/dshash.h
@@ -252,6 +264,8 @@ files:
 - ext/pg_query/include/libpq/pqcomm.h
 - ext/pg_query/include/libpq/pqformat.h
 - ext/pg_query/include/libpq/pqsignal.h
+- ext/pg_query/include/libpq/sasl.h
+- ext/pg_query/include/libpq/scram.h
 - ext/pg_query/include/mb/pg_wchar.h
 - ext/pg_query/include/mb/stringinfo_mb.h
 - ext/pg_query/include/miscadmin.h
@@ -261,8 +275,10 @@ files:
 - ext/pg_query/include/nodes/lockoptions.h
 - ext/pg_query/include/nodes/makefuncs.h
 - ext/pg_query/include/nodes/memnodes.h
+- ext/pg_query/include/nodes/miscnodes.h
 - ext/pg_query/include/nodes/nodeFuncs.h
 - ext/pg_query/include/nodes/nodes.h
+- ext/pg_query/include/nodes/nodetags.h
 - ext/pg_query/include/nodes/params.h
 - ext/pg_query/include/nodes/parsenodes.h
 - ext/pg_query/include/nodes/pathnodes.h
@@ -270,6 +286,9 @@ files:
 - ext/pg_query/include/nodes/plannodes.h
 - ext/pg_query/include/nodes/primnodes.h
 - ext/pg_query/include/nodes/print.h
+- ext/pg_query/include/nodes/queryjumble.h
+- ext/pg_query/include/nodes/replnodes.h
+- ext/pg_query/include/nodes/supportnodes.h
 - ext/pg_query/include/nodes/tidbitmap.h
 - ext/pg_query/include/nodes/value.h
 - ext/pg_query/include/optimizer/cost.h
@@ -279,8 +298,6 @@ files:
 - ext/pg_query/include/optimizer/paths.h
 - ext/pg_query/include/optimizer/planmain.h
 - ext/pg_query/include/parser/analyze.h
-- ext/pg_query/include/parser/gram.h
-- ext/pg_query/include/parser/gramparse.h
 - ext/pg_query/include/parser/kwlist.h
 - ext/pg_query/include/parser/parse_agg.h
 - ext/pg_query/include/parser/parse_coerce.h
@@ -330,6 +347,7 @@ files:
 - ext/pg_query/include/port/pg_bitutils.h
 - ext/pg_query/include/port/pg_bswap.h
 - ext/pg_query/include/port/pg_crc32c.h
+- ext/pg_query/include/port/simd.h
 - ext/pg_query/include/portability/instr_time.h
 - ext/pg_query/include/postgres.h
 - ext/pg_query/include/postgres_ext.h
@@ -363,6 +381,8 @@ files:
 - ext/pg_query/include/rewrite/rewriteHandler.h
 - ext/pg_query/include/rewrite/rewriteManip.h
 - ext/pg_query/include/rewrite/rewriteSupport.h
+- ext/pg_query/include/src_backend_nodes_copyfuncs.funcs.c
+- ext/pg_query/include/src_backend_nodes_equalfuncs.funcs.c
 - ext/pg_query/include/storage/backendid.h
 - ext/pg_query/include/storage/block.h
 - ext/pg_query/include/storage/buf.h
@@ -393,7 +413,7 @@ files:
 - ext/pg_query/include/storage/procarray.h
 - ext/pg_query/include/storage/proclist_types.h
 - ext/pg_query/include/storage/procsignal.h
-- ext/pg_query/include/storage/relfilenode.h
+- ext/pg_query/include/storage/relfilelocator.h
 - ext/pg_query/include/storage/s_lock.h
 - ext/pg_query/include/storage/sharedfileset.h
 - ext/pg_query/include/storage/shm_mq.h
@@ -427,7 +447,6 @@ files:
 - ext/pg_query/include/utils/datetime.h
 - ext/pg_query/include/utils/datum.h
 - ext/pg_query/include/utils/dsa.h
-- ext/pg_query/include/utils/dynahash.h
 - ext/pg_query/include/utils/elog.h
 - ext/pg_query/include/utils/errcodes.h
 - ext/pg_query/include/utils/expandeddatum.h
@@ -437,17 +456,20 @@ files:
 - ext/pg_query/include/utils/fmgrprotos.h
 - ext/pg_query/include/utils/fmgrtab.h
 - ext/pg_query/include/utils/guc.h
+- ext/pg_query/include/utils/guc_hooks.h
 - ext/pg_query/include/utils/guc_tables.h
 - ext/pg_query/include/utils/hsearch.h
 - ext/pg_query/include/utils/inval.h
+- ext/pg_query/include/utils/logtape.h
 - ext/pg_query/include/utils/lsyscache.h
 - ext/pg_query/include/utils/memdebug.h
 - ext/pg_query/include/utils/memutils.h
+- ext/pg_query/include/utils/memutils_internal.h
+- ext/pg_query/include/utils/memutils_memorychunk.h
 - ext/pg_query/include/utils/numeric.h
 - ext/pg_query/include/utils/palloc.h
 - ext/pg_query/include/utils/partcache.h
 - ext/pg_query/include/utils/pg_locale.h
-- ext/pg_query/include/utils/pg_lsn.h
 - ext/pg_query/include/utils/pgstat_internal.h
 - ext/pg_query/include/utils/pidfile.h
 - ext/pg_query/include/utils/plancache.h
@@ -455,13 +477,11 @@ files:
 - ext/pg_query/include/utils/probes.h
 - ext/pg_query/include/utils/ps_status.h
 - ext/pg_query/include/utils/queryenvironment.h
-- ext/pg_query/include/utils/queryjumble.h
 - ext/pg_query/include/utils/regproc.h
 - ext/pg_query/include/utils/rel.h
 - ext/pg_query/include/utils/relcache.h
 - ext/pg_query/include/utils/reltrigger.h
 - ext/pg_query/include/utils/resowner.h
-- ext/pg_query/include/utils/rls.h
 - ext/pg_query/include/utils/ruleutils.h
 - ext/pg_query/include/utils/sharedtuplestore.h
 - ext/pg_query/include/utils/snapmgr.h
@@ -473,10 +493,10 @@ files:
 - ext/pg_query/include/utils/tuplesort.h
 - ext/pg_query/include/utils/tuplestore.h
 - ext/pg_query/include/utils/typcache.h
-- ext/pg_query/include/utils/tzparser.h
 - ext/pg_query/include/utils/varlena.h
 - ext/pg_query/include/utils/wait_event.h
 - ext/pg_query/include/utils/xml.h
+- ext/pg_query/include/varatt.h
 - ext/pg_query/include/xxhash.h
 - ext/pg_query/include/xxhash/xxhash.h
 - ext/pg_query/pg_query.c
@@ -520,30 +540,30 @@ files:
 - ext/pg_query/src_backend_parser_scansup.c
 - ext/pg_query/src_backend_postmaster_postmaster.c
 - ext/pg_query/src_backend_storage_ipc_ipc.c
-- ext/pg_query/src_backend_storage_lmgr_s_lock.c
 - ext/pg_query/src_backend_tcop_postgres.c
 - ext/pg_query/src_backend_utils_activity_pgstat_database.c
 - ext/pg_query/src_backend_utils_adt_datum.c
 - ext/pg_query/src_backend_utils_adt_expandeddatum.c
 - ext/pg_query/src_backend_utils_adt_format_type.c
+- ext/pg_query/src_backend_utils_adt_numutils.c
 - ext/pg_query/src_backend_utils_adt_ruleutils.c
 - ext/pg_query/src_backend_utils_error_assert.c
 - ext/pg_query/src_backend_utils_error_elog.c
 - ext/pg_query/src_backend_utils_fmgr_fmgr.c
-- ext/pg_query/src_backend_utils_hash_dynahash.c
 - ext/pg_query/src_backend_utils_init_globals.c
 - ext/pg_query/src_backend_utils_mb_mbutils.c
-- ext/pg_query/src_backend_utils_misc_guc.c
+- ext/pg_query/src_backend_utils_misc_guc_tables.c
+- ext/pg_query/src_backend_utils_mmgr_alignedalloc.c
 - ext/pg_query/src_backend_utils_mmgr_aset.c
+- ext/pg_query/src_backend_utils_mmgr_generation.c
 - ext/pg_query/src_backend_utils_mmgr_mcxt.c
+- ext/pg_query/src_backend_utils_mmgr_slab.c
 - ext/pg_query/src_common_encnames.c
 - ext/pg_query/src_common_hashfn.c
 - ext/pg_query/src_common_keywords.c
 - ext/pg_query/src_common_kwlist_d.h
 - ext/pg_query/src_common_kwlookup.c
-- ext/pg_query/src_common_pg_prng.c
 - ext/pg_query/src_common_psprintf.c
-- ext/pg_query/src_common_string.c
 - ext/pg_query/src_common_stringinfo.c
 - ext/pg_query/src_common_wchar.c
 - ext/pg_query/src_pl_plpgsql_src_pl_comp.c
@@ -554,7 +574,6 @@ files:
 - ext/pg_query/src_pl_plpgsql_src_pl_scanner.c
 - ext/pg_query/src_pl_plpgsql_src_pl_unreserved_kwlist_d.h
 - ext/pg_query/src_port_pg_bitutils.c
-- ext/pg_query/src_port_pgsleep.c
 - ext/pg_query/src_port_pgstrcasecmp.c
 - ext/pg_query/src_port_qsort.c
 - ext/pg_query/src_port_snprintf.c
@@ -579,7 +598,7 @@ homepage: https://github.com/pganalyze/pg_query
 licenses:
 - BSD-3-Clause
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options:
 - "--main"
 - README.md
@@ -599,7 +618,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubygems_version: 3.1.6
-signing_key: 
+signing_key:
 specification_version: 4
 summary: PostgreSQL query parsing and normalization library
 test_files: []

data/ext/pg_query/include/catalog/pg_parameter_acl.h

@@ -1,60 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_parameter_acl.h
- *	  definition of the "configuration parameter ACL" system catalog
- *	  (pg_parameter_acl).
- *
- *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/catalog/pg_parameter_acl.h
- *
- * NOTES
- *	  The Catalog.pm module reads this file and derives schema
- *	  information.
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_PARAMETER_ACL_H
-#define PG_PARAMETER_ACL_H
-
-#include "catalog/genbki.h"
-#include "catalog/pg_parameter_acl_d.h"
-
-/* ----------------
- *		pg_parameter_acl definition.  cpp turns this into
- *		typedef struct FormData_pg_parameter_acl
- * ----------------
- */
-CATALOG(pg_parameter_acl,6243,ParameterAclRelationId) BKI_SHARED_RELATION
-{
-	Oid			oid;			/* oid */
-
-#ifdef CATALOG_VARLEN			/* variable-length fields start here */
-	/* name of parameter */
-	text		parname BKI_FORCE_NOT_NULL;
-
-	/* access permissions */
-	aclitem		paracl[1] BKI_DEFAULT(_null_);
-#endif
-} FormData_pg_parameter_acl;
-
-
-/* ----------------
- *		Form_pg_parameter_acl corresponds to a pointer to a tuple with
- *		the format of pg_parameter_acl relation.
- * ----------------
- */
-typedef FormData_pg_parameter_acl * Form_pg_parameter_acl;
-
-DECLARE_TOAST_WITH_MACRO(pg_parameter_acl, 6244, 6245, PgParameterAclToastTable, PgParameterAclToastIndex);
-
-DECLARE_UNIQUE_INDEX(pg_parameter_acl_parname_index, 6246, ParameterAclParnameIndexId, on pg_parameter_acl using btree(parname text_ops));
-DECLARE_UNIQUE_INDEX_PKEY(pg_parameter_acl_oid_index, 6247, ParameterAclOidIndexId, on pg_parameter_acl using btree(oid oid_ops));
-
-
-extern Oid	ParameterAclLookup(const char *parameter, bool missing_ok);
-extern Oid	ParameterAclCreate(const char *parameter);
-
-#endif							/* PG_PARAMETER_ACL_H */

data/ext/pg_query/include/catalog/pg_parameter_acl_d.h

@@ -1,34 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * pg_parameter_acl_d.h
- *    Macro definitions for pg_parameter_acl
- *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * NOTES
- *  ******************************
- *  *** DO NOT EDIT THIS FILE! ***
- *  ******************************
- *
- *  It has been GENERATED by src/backend/catalog/genbki.pl
- *
- *-------------------------------------------------------------------------
- */
-#ifndef PG_PARAMETER_ACL_D_H
-#define PG_PARAMETER_ACL_D_H
-
-#define ParameterAclRelationId 6243
-#define PgParameterAclToastTable 6244
-#define PgParameterAclToastIndex 6245
-#define ParameterAclParnameIndexId 6246
-#define ParameterAclOidIndexId 6247
-
-#define Anum_pg_parameter_acl_oid 1
-#define Anum_pg_parameter_acl_parname 2
-#define Anum_pg_parameter_acl_paracl 3
-
-#define Natts_pg_parameter_acl 3
-
-
-#endif							/* PG_PARAMETER_ACL_D_H */

data/ext/pg_query/include/commands/variable.h

@@ -1,38 +0,0 @@
-/*
- * variable.h
- *		Routines for handling specialized SET variables.
- *
- * Portions Copyright (c) 1996-2022, PostgreSQL Global Development Group
- * Portions Copyright (c) 1994, Regents of the University of California
- *
- * src/include/commands/variable.h
- */
-#ifndef VARIABLE_H
-#define VARIABLE_H
-
-#include "utils/guc.h"
-
-
-extern bool check_datestyle(char **newval, void **extra, GucSource source);
-extern void assign_datestyle(const char *newval, void *extra);
-extern bool check_timezone(char **newval, void **extra, GucSource source);
-extern void assign_timezone(const char *newval, void *extra);
-extern const char *show_timezone(void);
-extern bool check_log_timezone(char **newval, void **extra, GucSource source);
-extern void assign_log_timezone(const char *newval, void *extra);
-extern const char *show_log_timezone(void);
-extern bool check_transaction_read_only(bool *newval, void **extra, GucSource source);
-extern bool check_XactIsoLevel(int *newval, void **extra, GucSource source);
-extern bool check_transaction_deferrable(bool *newval, void **extra, GucSource source);
-extern bool check_random_seed(double *newval, void **extra, GucSource source);
-extern void assign_random_seed(double newval, void *extra);
-extern const char *show_random_seed(void);
-extern bool check_client_encoding(char **newval, void **extra, GucSource source);
-extern void assign_client_encoding(const char *newval, void *extra);
-extern bool check_session_authorization(char **newval, void **extra, GucSource source);
-extern void assign_session_authorization(const char *newval, void *extra);
-extern bool check_role(char **newval, void **extra, GucSource source);
-extern void assign_role(const char *newval, void *extra);
-extern const char *show_role(void);
-
-#endif							/* VARIABLE_H */

data/ext/pg_query/include/getaddrinfo.h

@@ -1,162 +0,0 @@
-/*-------------------------------------------------------------------------
- *
- * getaddrinfo.h
- *	  Support getaddrinfo() on platforms that don't have it.
- *
- * Note: we use our own routines on platforms that don't HAVE_STRUCT_ADDRINFO,
- * whether or not the library routine getaddrinfo() can be found.  This
- * policy is needed because on some platforms a manually installed libbind.a
- * may provide getaddrinfo(), yet the system headers may not provide the
- * struct definitions needed to call it.  To avoid conflict with the libbind
- * definition in such cases, we rename our routines to pg_xxx() via macros.
- *
- * This code will also work on platforms where struct addrinfo is defined
- * in the system headers but no getaddrinfo() can be located.
- *
- * Copyright (c) 2003-2022, PostgreSQL Global Development Group
- *
- * src/include/getaddrinfo.h
- *
- *-------------------------------------------------------------------------
- */
-#ifndef GETADDRINFO_H
-#define GETADDRINFO_H
-
-#include <sys/socket.h>
-#include <netdb.h>
-
-
-/* Various macros that ought to be in <netdb.h>, but might not be */
-
-#ifndef EAI_FAIL
-#ifndef WIN32
-#define EAI_BADFLAGS	(-1)
-#define EAI_NONAME		(-2)
-#define EAI_AGAIN		(-3)
-#define EAI_FAIL		(-4)
-#define EAI_FAMILY		(-6)
-#define EAI_SOCKTYPE	(-7)
-#define EAI_SERVICE		(-8)
-#define EAI_MEMORY		(-10)
-#define EAI_SYSTEM		(-11)
-#else							/* WIN32 */
-#ifdef _MSC_VER
-#ifndef WSA_NOT_ENOUGH_MEMORY
-#define WSA_NOT_ENOUGH_MEMORY	(WSAENOBUFS)
-#endif
-#define WSATYPE_NOT_FOUND		(WSABASEERR+109)
-#endif
-#define EAI_AGAIN		WSATRY_AGAIN
-#define EAI_BADFLAGS	WSAEINVAL
-#define EAI_FAIL		WSANO_RECOVERY
-#define EAI_FAMILY		WSAEAFNOSUPPORT
-#define EAI_MEMORY		WSA_NOT_ENOUGH_MEMORY
-#define EAI_NODATA		WSANO_DATA
-#define EAI_NONAME		WSAHOST_NOT_FOUND
-#define EAI_SERVICE		WSATYPE_NOT_FOUND
-#define EAI_SOCKTYPE	WSAESOCKTNOSUPPORT
-#endif							/* !WIN32 */
-#endif							/* !EAI_FAIL */
-
-#ifndef AI_PASSIVE
-#define AI_PASSIVE		0x0001
-#endif
-
-#ifndef AI_NUMERICHOST
-/*
- * some platforms don't support AI_NUMERICHOST; define as zero if using
- * the system version of getaddrinfo...
- */
-#if defined(HAVE_STRUCT_ADDRINFO) && defined(HAVE_GETADDRINFO)
-#define AI_NUMERICHOST	0
-#else
-#define AI_NUMERICHOST	0x0004
-#endif
-#endif
-
-#ifndef NI_NUMERICHOST
-#define NI_NUMERICHOST	1
-#endif
-#ifndef NI_NUMERICSERV
-#define NI_NUMERICSERV	2
-#endif
-#ifndef NI_NAMEREQD
-#define NI_NAMEREQD		4
-#endif
-
-#ifndef NI_MAXHOST
-#define NI_MAXHOST	1025
-#endif
-#ifndef NI_MAXSERV
-#define NI_MAXSERV	32
-#endif
-
-
-#ifndef HAVE_STRUCT_ADDRINFO
-
-#ifndef WIN32
-struct addrinfo
-{
-	int			ai_flags;
-	int			ai_family;
-	int			ai_socktype;
-	int			ai_protocol;
-	size_t		ai_addrlen;
-	struct sockaddr *ai_addr;
-	char	   *ai_canonname;
-	struct addrinfo *ai_next;
-};
-#else
-/*
- *	The order of the structure elements on Win32 doesn't match the
- *	order specified in the standard, but we have to match it for
- *	IPv6 to work.
- */
-struct addrinfo
-{
-	int			ai_flags;
-	int			ai_family;
-	int			ai_socktype;
-	int			ai_protocol;
-	size_t		ai_addrlen;
-	char	   *ai_canonname;
-	struct sockaddr *ai_addr;
-	struct addrinfo *ai_next;
-};
-#endif
-#endif							/* HAVE_STRUCT_ADDRINFO */
-
-
-#ifndef HAVE_GETADDRINFO
-
-/* Rename private copies per comments above */
-#ifdef getaddrinfo
-#undef getaddrinfo
-#endif
-#define getaddrinfo pg_getaddrinfo
-
-#ifdef freeaddrinfo
-#undef freeaddrinfo
-#endif
-#define freeaddrinfo pg_freeaddrinfo
-
-#ifdef gai_strerror
-#undef gai_strerror
-#endif
-#define gai_strerror pg_gai_strerror
-
-#ifdef getnameinfo
-#undef getnameinfo
-#endif
-#define getnameinfo pg_getnameinfo
-
-extern int	getaddrinfo(const char *node, const char *service,
-						const struct addrinfo *hints, struct addrinfo **res);
-extern void freeaddrinfo(struct addrinfo *res);
-extern const char *gai_strerror(int errcode);
-extern int	getnameinfo(const struct sockaddr *sa, int salen,
-						char *node, int nodelen,
-						char *service, int servicelen, int flags);
-#endif							/* HAVE_GETADDRINFO */
-
-#endif							/* GETADDRINFO_H */