pg_query 5.0.0 → 5.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b94d85770885d7cc76eea209b1de0ac6e7aa8d8408cb2a986e846852c26bbdd0
-  data.tar.gz: 01457cf09362555c92dc90116e3cce752c13778c4cb3daa852423e5e6a4df01f
+  metadata.gz: b7ecf94b691013f4f32e593af1a9626f26bfe148bbb6482c4d4d3d92758aadec
+  data.tar.gz: 554972dda2feecab635e154c1134d6da4fe7ce136c44ce7c3dea4c6e0b5d3a4c
 SHA512:
-  metadata.gz: 6b817e4f20f42d2497de9df7807d8e06100e81b863fd7a4a49f18840c32d1921c4c26a5c2382221102ab23b74859a9fd0708c0c7caff8806ffec012d31285116
-  data.tar.gz: 807ee8ff136dcfd0d0dd2d8c50613b33b032f4a37dd287ea83a671ed3afa0e1bba389c41b5d9955eb1ee8783640caf46bde91eeed6e710ac88fb524f03ce0318
+  metadata.gz: 2f09d9bf624acd8e13fdfcc975871c2e9d184a10fc7630af8a060e9a97cdfffba749145d4be1b6ec75cde4be42a5629c26545bf6b1ba6617d3354228e191d7b1
+  data.tar.gz: 602ca65b8c7f700dba44a7d2ed0b13d41953cf053d101b07d1766564b9fd34db687c6321e320c6f54977ee1be21032ceae29ec69be1b5d7eb3d3cde26ead1f1a

data/CHANGELOG.md

@@ -4,6 +4,15 @@
 
 * ...
 
+## 5.1.0     2024-01-09
+
+* Update to libpg_query 16-5.1.0
+  - Add support for running on Windows
+  - Add support for compiling on 32-bit systems
+* Treewalker: Allow passing a block with a single argument to walk!
+* PgQuery::Node: Add inner and inner= helpers to get/set inner object
+
+
 ## 5.0.0     2023-12-22
 
 * Upgrade to libpg_query 16-5.0.0

data/Rakefile

@@ -5,8 +5,8 @@ require 'rspec/core/rake_task'
 require 'rubocop/rake_task'
 require 'open-uri'
 
-LIB_PG_QUERY_TAG = '16-5.0.0'.freeze
-LIB_PG_QUERY_SHA256SUM = '7cf26922cbc41668fa79332504f2d5638339baa9411912b8df4526ccd1d7029e'.freeze
+LIB_PG_QUERY_TAG = '16-5.1.0'.freeze
+LIB_PG_QUERY_SHA256SUM = '31f25b573da1c966bc762b0313b0a50cdd03aabdbaf666d90469eddcb1656df7'.freeze
 
 Rake::ExtensionTask.new 'pg_query' do |ext|
   ext.lib_dir = 'lib/pg_query'
@@ -62,11 +62,10 @@ task :update_source do
   # Reduce everything down to one directory
   system("mkdir -p #{extdir}")
   system("cp -a #{libdir}/src/* #{extdir}/")
+  system("mv #{extdir}/postgres/include #{extdir}/include/postgres")
   system("mv #{extdir}/postgres/* #{extdir}/")
   system("rmdir #{extdir}/postgres")
   system("cp -a #{libdir}/pg_query.h #{extdir}/include")
-  # Make sure every .c file in the top-level directory is its own translation unit
-  system("mv #{extdir}/*{_conds,_defs,_helper,.funcs}.c #{extdir}/include")
   # Protobuf definitions
   system("protoc --proto_path=#{libdir}/protobuf --ruby_out=#{File.join(__dir__, 'lib/pg_query')} #{libdir}/protobuf/pg_query.proto")
   system("mkdir -p #{extdir}/include/protobuf")

data/ext/pg_query/extconf.rb

@@ -7,20 +7,30 @@ require 'pathname'
 
 $objs = Dir.glob(File.join(__dir__, '*.c')).map { |f| Pathname.new(f).sub_ext('.o').to_s }
 
-$CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -Wno-clobbered -Wno-sign-compare -Wno-discarded-qualifiers -Wno-unknown-warning-option -g"
+if RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  $CFLAGS << " -fvisibility=hidden -O3 -Wall -fno-strict-aliasing -fwrapv -fstack-protector -Wno-unused-function -Wno-unused-variable -Wno-clobbered -Wno-sign-compare -Wno-discarded-qualifiers -Wno-unknown-warning-option -g"
+end
+
+$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + "-I#{File.join(__dir__, 'include', 'postgres')} " + $INCFLAGS
 
-$INCFLAGS = "-I#{File.join(__dir__, 'include')} " + $INCFLAGS
+if RUBY_PLATFORM =~ /cygwin|mswin|mingw|bccwin|wince|emx/
+  $INCFLAGS = "-I#{File.join(__dir__, 'include', 'postgres', 'port', 'win32')} " + $INCFLAGS
+end
+
+if RUBY_PLATFORM =~ /mswin/
+  $INCFLAGS = "-I#{File.join(__dir__, 'include', 'postgres', 'port', 'win32_msvc')} " + $INCFLAGS
+end
 
 SYMFILE =
   if RUBY_PLATFORM =~ /freebsd/
     File.join(__dir__, 'pg_query_ruby_freebsd.sym')
-  else
+  elsif RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
     File.join(__dir__, 'pg_query_ruby.sym')
   end
 
 if RUBY_PLATFORM =~ /darwin/
   $DLDFLAGS << " -Wl,-exported_symbols_list #{SYMFILE}" unless defined?(::Rubinius)
-else
+elsif RUBY_PLATFORM !~ /cygwin|mswin|mingw|bccwin|wince|emx/
   $DLDFLAGS << " -Wl,--retain-symbols-file=#{SYMFILE}"
 end
 

data/ext/pg_query/include/pg_query_fingerprint_defs.c

@@ -5894,7 +5894,7 @@ _fingerprintRTEPermissionInfo(FingerprintContext *ctx, const RTEPermissionInfo *
 
   if (node->requiredPerms != 0) {
     char buffer[50];
-    sprintf(buffer, "%ld", node->requiredPerms);
+    sprintf(buffer, UINT64_FORMAT, node->requiredPerms);
     _fingerprintString(ctx, "requiredPerms");
     _fingerprintString(ctx, buffer);
   }

data/ext/pg_query/include/pg_query_outfuncs_defs.c

@@ -1240,7 +1240,7 @@ _outRTEPermissionInfo(OUT_TYPE(RTEPermissionInfo, RTEPermissionInfo) out, const
 {
   WRITE_UINT_FIELD(relid, relid, relid);
   WRITE_BOOL_FIELD(inh, inh, inh);
-  WRITE_LONG_FIELD(required_perms, requiredPerms, requiredPerms);
+  WRITE_UINT64_FIELD(required_perms, requiredPerms, requiredPerms);
   WRITE_UINT_FIELD(check_as_user, checkAsUser, checkAsUser);
   WRITE_BITMAPSET_FIELD(selected_cols, selectedCols, selectedCols);
   WRITE_BITMAPSET_FIELD(inserted_cols, insertedCols, insertedCols);

data/ext/pg_query/include/pg_query_readfuncs_defs.c

@@ -1419,7 +1419,7 @@ _readRTEPermissionInfo(OUT_TYPE(RTEPermissionInfo, RTEPermissionInfo) msg)
   RTEPermissionInfo *node = makeNode(RTEPermissionInfo);
   READ_UINT_FIELD(relid, relid, relid);
   READ_BOOL_FIELD(inh, inh, inh);
-  READ_LONG_FIELD(required_perms, requiredPerms, requiredPerms);
+  READ_UINT64_FIELD(required_perms, requiredPerms, requiredPerms);
   READ_UINT_FIELD(check_as_user, checkAsUser, checkAsUser);
   READ_BITMAPSET_FIELD(selected_cols, selectedCols, selectedCols);
   READ_BITMAPSET_FIELD(inserted_cols, insertedCols, insertedCols);

data/ext/pg_query/include/{miscadmin.h → postgres/miscadmin.h}

@@ -167,7 +167,7 @@ extern PGDLLIMPORT bool IsUnderPostmaster;
 extern PGDLLIMPORT bool IsBackgroundWorker;
 extern PGDLLIMPORT bool IsBinaryUpgrade;
 
-extern PGDLLIMPORT __thread  bool ExitOnAnyError;
+extern PGDLLIMPORT __thread bool ExitOnAnyError;
 
 extern PGDLLIMPORT char *DataDir;
 extern PGDLLIMPORT int data_directory_mode;

data/ext/pg_query/include/{nodes → postgres/nodes}/nodes.h

@@ -161,7 +161,7 @@ typedef struct Node
  *	Fortunately, this macro isn't recursive so we just define
  *	a global variable for this purpose.
  */
-extern PGDLLIMPORT Node *newNodeMacroHolder;
+extern PGDLLIMPORT __thread Node *newNodeMacroHolder;
 
 #define newNode(size, tag) \
 ( \

data/ext/pg_query/include/{parser → postgres/parser}/parser.h

@@ -53,9 +53,9 @@ typedef enum
 }			BackslashQuoteType;
 
 /* GUC variables in scan.l (every one of these is a bad idea :-() */
-extern PGDLLIMPORT __thread  int backslash_quote;
-extern PGDLLIMPORT __thread  bool escape_string_warning;
-extern PGDLLIMPORT __thread  bool standard_conforming_strings;
+extern PGDLLIMPORT __thread int backslash_quote;
+extern PGDLLIMPORT __thread bool escape_string_warning;
+extern PGDLLIMPORT __thread bool standard_conforming_strings;
 
 
 /* Primary entry point for the raw parsing functions */

data/ext/pg_query/include/{pg_config.h → postgres/pg_config.h}

@@ -650,7 +650,7 @@
 #define PG_VERSION_NUM 160001
 
 /* A string containing the version number, platform, and C compiler */
-#define PG_VERSION_STR "PostgreSQL 16.1 on aarch64-apple-darwin21.6.0, compiled by Apple clang version 14.0.0 (clang-1400.0.29.102), 64-bit"
+#define PG_VERSION_STR "PostgreSQL 16.1 (libpg_query)"
 
 /* Define to 1 to allow profiling output to be saved separately for each
    process. */
@@ -826,18 +826,152 @@
 
 /* Define to how the compiler spells `typeof'. */
 /* #undef typeof */
+/* This causes compatibility problems on some Linux distros, with "xlocale.h" not being available */
 #undef HAVE_LOCALE_T
 #undef LOCALE_T_IN_XLOCALE
 #undef WCSTOMBS_L_IN_XLOCALE
-#undef PG_INT128_TYPE
+
+/* Support gcc earlier than 4.6.0 and MSVC */
 #undef HAVE__STATIC_ASSERT
+
+/* Avoid dependency on execinfo (requires extra library on musl-libc based systems, not supported on Windows) */
 #undef HAVE_EXECINFO_H
 #undef HAVE_BACKTRACE_SYMBOLS
+
+/* Avoid dependency on hardware popcount instructions (POPQNTQ) on x86 */
 #undef HAVE_X86_64_POPCNTQ
+
+/* Avoid dependency on cpuid.h (only supported on x86 systems) */
 #undef HAVE__GET_CPUID
+
+/* Avoid CRC extension usage to ensure we are not architecture-dependent */
 #undef USE_ARMV8_CRC32C
 #undef USE_SSE42_CRC32C_WITH_RUNTIME_CHECK
+
+/* Ensure we do not fail on systems that have strchrnul support (FreeBSD, NetBSD and newer glibc) */
 #include <stdlib.h>
 #if defined(__FreeBSD__) || defined(__NetBSD__) || (defined(__GLIBC__) && ((__GLIBC__ == 2 && __GLIBC_MINOR__ >= 38) || __GLIBC__ > 2))
 #define HAVE_STRCHRNUL
 #endif
+
+/* 32-bit */
+#if defined(_WIN32) || __SIZEOF_POINTER__ == 4
+#undef ALIGNOF_DOUBLE
+#define ALIGNOF_DOUBLE 4
+#undef ALIGNOF_LONG
+#define ALIGNOF_LONG 4
+#define ALIGNOF_LONG_LONG_INT 4
+#undef ALIGNOF_PG_INT128_TYPE
+#undef HAVE_LONG_INT_64
+#define HAVE_LONG_LONG_INT_64 1
+#undef INT64_MODIFIER
+#define INT64_MODIFIER "ll"
+#undef PG_INT128_TYPE
+#undef PG_INT64_TYPE
+#define PG_INT64_TYPE long long int
+#undef SIZEOF_LONG
+#define SIZEOF_LONG 4
+#undef SIZEOF_OFF_T
+#define SIZEOF_OFF_T 4
+#undef SIZEOF_SIZE_T
+#define SIZEOF_SIZE_T 4
+#undef SIZEOF_VOID_P
+#define SIZEOF_VOID_P 4
+#endif
+
+/* Windows */
+#if defined(_WIN32) || defined(_WIN64)
+#undef HAVE_COPYFILE
+#undef HAVE_COPYFILE_H
+#undef HAVE_DECL_F_FULLFSYNC
+#define HAVE_DECL_F_FULLFSYNC 0
+#undef HAVE_DECL_PREADV
+#define HAVE_DECL_PREADV 0
+#undef HAVE_DECL_PWRITEV
+#define HAVE_DECL_PWRITEV 0
+#undef HAVE_DECL_STRLCAT
+#define HAVE_DECL_STRLCAT 0
+#undef HAVE_DECL_STRLCPY
+#define HAVE_DECL_STRLCPY 0
+#undef HAVE_GETIFADDRS
+#undef HAVE_GETPEEREID
+#undef HAVE_IFADDRS_H
+#undef HAVE_INET_ATON
+#undef HAVE_INT_OPTRESET
+#undef HAVE_KQUEUE
+#undef HAVE_LANGINFO_H
+#undef HAVE_MEMSET_S
+#undef HAVE_MKDTEMP
+#undef HAVE_PTHREAD
+#undef HAVE_PTHREAD_BARRIER_WAIT
+#undef HAVE_PTHREAD_IS_THREADED_NP
+#undef HAVE_PTHREAD_PRIO_INHERIT
+#undef HAVE_STRERROR_R
+#undef HAVE_STRLCAT
+#undef HAVE_STRLCPY
+#undef HAVE_STRSIGNAL
+#undef HAVE_STRUCT_SOCKADDR_SA_LEN
+#undef HAVE_STRUCT_TM_TM_ZONE
+#undef HAVE_SYSLOG
+#undef HAVE_SYS_EVENT_H
+#undef HAVE_SYS_UCRED_H
+#undef HAVE_TERMIOS_H
+#undef HAVE_UNION_SEMUN
+#undef HAVE_USELOCALE
+#define HAVE__CONFIGTHREADLOCALE 1
+#undef STRERROR_R_INT
+#undef USE_SYSV_SEMAPHORES
+#undef USE_SYSV_SHARED_MEMORY
+#define USE_WIN32_SEMAPHORES 1
+#define USE_WIN32_SHARED_MEMORY 1
+#undef PG_PRINTF_ATTRIBUTE
+#if defined(__clang__)
+#define PG_PRINTF_ATTRIBUTE printf
+#elif defined(__MINGW32__) || defined(__MINGW64__) || defined(__MSYS__) || defined(__CYGWIN__)
+#define PG_PRINTF_ATTRIBUTE gnu_printf
+#endif
+#if defined(__MINGW32__) || defined(__MINGW64__) || defined(__MSYS__) || defined(__CYGWIN__)
+#undef HAVE_MBSTOWCS_L
+#undef HAVE_WCSTOMBS_L
+#define HAVE_CRTDEFS_H 1
+#define HAVE_PTHREAD_BARRIER_WAIT 1
+#endif
+#endif
+
+/* Microsoft Visual Studio Compiler */
+#ifdef _MSC_VER
+#undef HAVE_COMPUTED_GOTO
+#undef HAVE_GCC__ATOMIC_INT32_CAS
+#undef HAVE_GCC__ATOMIC_INT64_CAS
+#undef HAVE_GCC__SYNC_CHAR_TAS
+#undef HAVE_GCC__SYNC_INT32_CAS
+#undef HAVE_GCC__SYNC_INT32_TAS
+#undef HAVE_GCC__SYNC_INT64_CAS
+#undef HAVE_GETOPT
+#undef HAVE_GETOPT_H
+#undef HAVE_GETOPT_LONG
+#undef HAVE_INTTYPES_H
+#undef HAVE_INT_OPTERR
+#undef HAVE_LIBM
+#undef HAVE_STRINGS_H
+#undef HAVE_STRUCT_OPTION
+#undef HAVE_TYPEOF
+#undef HAVE_VISIBILITY_ATTRIBUTE
+#undef HAVE__BOOL
+#undef HAVE__BUILTIN_BSWAP16
+#undef HAVE__BUILTIN_BSWAP32
+#undef HAVE__BUILTIN_BSWAP64
+#undef HAVE__BUILTIN_CLZ
+#undef HAVE__BUILTIN_CONSTANT_P
+#undef HAVE__BUILTIN_CTZ
+#undef HAVE__BUILTIN_FRAME_ADDRESS
+#undef HAVE__BUILTIN_OP_OVERFLOW
+#undef HAVE__BUILTIN_POPCOUNT
+#undef HAVE__BUILTIN_TYPES_COMPATIBLE_P
+#undef HAVE__BUILTIN_UNREACHABLE
+#ifndef __cplusplus
+#define inline __inline
+#endif
+#undef restrict
+#define __thread __declspec( thread )
+#endif

data/ext/pg_query/include/postgres/pg_config_os.h

@@ -0,0 +1,8 @@
+#if defined(_WIN32) || defined(_WIN64)
+#include "port/win32.h"
+#undef PGDLLIMPORT
+#undef PGDLLEXPORT
+#ifdef __clang__
+#undef __MINGW64__
+#endif /* __clang__ */
+#endif

data/ext/pg_query/include/{pgstat.h → postgres/pgstat.h}

@@ -764,7 +764,7 @@ extern PGDLLIMPORT PgStat_Counter pgStatActiveTime;
 extern PGDLLIMPORT PgStat_Counter pgStatTransactionIdleTime;
 
 /* updated by the traffic cop and in errfinish() */
-extern PGDLLIMPORT __thread  SessionEndType pgStatSessionEndCause;
+extern PGDLLIMPORT __thread SessionEndType pgStatSessionEndCause;
 
 
 /*

data/ext/pg_query/include/{pl_gram.h → postgres/pl_gram.h}

@@ -367,7 +367,7 @@ typedef union YYSTYPE
 # define YYSTYPE_IS_TRIVIAL 1
 #endif
 
-extern __thread  YYSTYPE plpgsql_yylval;
+extern __thread YYSTYPE plpgsql_yylval;
 
 #if ! defined YYLTYPE && ! defined YYLTYPE_IS_DECLARED
 typedef struct YYLTYPE
@@ -382,4 +382,4 @@ typedef struct YYLTYPE
 # define YYLTYPE_IS_TRIVIAL 1
 #endif
 
-extern __thread  YYLTYPE plpgsql_yylloc;
+extern __thread YYLTYPE plpgsql_yylloc;

data/ext/pg_query/include/{plpgsql.h → postgres/plpgsql.h}

@@ -1191,11 +1191,11 @@ typedef enum
 	IDENTIFIER_LOOKUP_EXPR		/* In SQL expression --- special case */
 } IdentifierLookup;
 
-extern __thread  IdentifierLookup plpgsql_IdentifierLookup;
+extern __thread IdentifierLookup plpgsql_IdentifierLookup;
 
-extern __thread  int plpgsql_variable_conflict;
+extern __thread int plpgsql_variable_conflict;
 
-extern __thread  bool plpgsql_print_strict_params;
+extern __thread bool plpgsql_print_strict_params;
 
 extern bool plpgsql_check_asserts;
 
@@ -1209,18 +1209,18 @@ extern bool plpgsql_check_asserts;
 extern int	plpgsql_extra_warnings;
 extern int	plpgsql_extra_errors;
 
-extern __thread  bool plpgsql_check_syntax;
-extern __thread  bool plpgsql_DumpExecTree;
+extern __thread bool plpgsql_check_syntax;
+extern __thread bool plpgsql_DumpExecTree;
 
-extern __thread  PLpgSQL_stmt_block *plpgsql_parse_result;
+extern __thread PLpgSQL_stmt_block *plpgsql_parse_result;
 
-extern __thread  int plpgsql_nDatums;
-extern __thread  PLpgSQL_datum **plpgsql_Datums;
+extern __thread int plpgsql_nDatums;
+extern __thread PLpgSQL_datum **plpgsql_Datums;
 
-extern __thread  char *plpgsql_error_funcname;
+extern __thread char *plpgsql_error_funcname;
 
-extern __thread  PLpgSQL_function *plpgsql_curr_compile;
-extern __thread  MemoryContext plpgsql_compile_tmp_cxt;
+extern __thread PLpgSQL_function *plpgsql_curr_compile;
+extern __thread MemoryContext plpgsql_compile_tmp_cxt;
 
 extern PLpgSQL_plugin **plpgsql_plugin_ptr;
 

data/ext/pg_query/include/postgres/port/atomics/arch-hppa.h

@@ -0,0 +1,17 @@
+/*-------------------------------------------------------------------------
+ *
+ * arch-hppa.h
+ *	  Atomic operations considerations specific to HPPA
+ *
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * NOTES:
+ *
+ * src/include/port/atomics/arch-hppa.h
+ *
+ *-------------------------------------------------------------------------
+ */
+
+/* HPPA doesn't do either read or write reordering */
+#define pg_memory_barrier_impl()		pg_compiler_barrier_impl()

data/ext/pg_query/include/postgres/port/atomics/generic-msvc.h

@@ -0,0 +1,101 @@
+/*-------------------------------------------------------------------------
+ *
+ * generic-msvc.h
+ *	  Atomic operations support when using MSVC
+ *
+ * Portions Copyright (c) 1996-2023, PostgreSQL Global Development Group
+ * Portions Copyright (c) 1994, Regents of the University of California
+ *
+ * NOTES:
+ *
+ * Documentation:
+ * * Interlocked Variable Access
+ *   http://msdn.microsoft.com/en-us/library/ms684122%28VS.85%29.aspx
+ *
+ * src/include/port/atomics/generic-msvc.h
+ *
+ *-------------------------------------------------------------------------
+ */
+#include <intrin.h>
+
+/* intentionally no include guards, should only be included by atomics.h */
+#ifndef INSIDE_ATOMICS_H
+#error "should be included via atomics.h"
+#endif
+
+#pragma intrinsic(_ReadWriteBarrier)
+#define pg_compiler_barrier_impl()	_ReadWriteBarrier()
+
+#ifndef pg_memory_barrier_impl
+#define pg_memory_barrier_impl()	MemoryBarrier()
+#endif
+
+#if defined(HAVE_ATOMICS)
+
+#define PG_HAVE_ATOMIC_U32_SUPPORT
+typedef struct pg_atomic_uint32
+{
+	volatile uint32 value;
+} pg_atomic_uint32;
+
+#define PG_HAVE_ATOMIC_U64_SUPPORT
+typedef struct pg_attribute_aligned(8) pg_atomic_uint64
+{
+	volatile uint64 value;
+} pg_atomic_uint64;
+
+
+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U32
+static inline bool
+pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
+									uint32 *expected, uint32 newval)
+{
+	bool	ret;
+	uint32	current;
+	current = InterlockedCompareExchange(&ptr->value, newval, *expected);
+	ret = current == *expected;
+	*expected = current;
+	return ret;
+}
+
+#define PG_HAVE_ATOMIC_FETCH_ADD_U32
+static inline uint32
+pg_atomic_fetch_add_u32_impl(volatile pg_atomic_uint32 *ptr, int32 add_)
+{
+	return InterlockedExchangeAdd(&ptr->value, add_);
+}
+
+/*
+ * The non-intrinsics versions are only available in vista upwards, so use the
+ * intrinsic version. Only supported on >486, but we require XP as a minimum
+ * baseline, which doesn't support the 486, so we don't need to add checks for
+ * that case.
+ */
+#pragma intrinsic(_InterlockedCompareExchange64)
+
+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U64
+static inline bool
+pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
+									uint64 *expected, uint64 newval)
+{
+	bool	ret;
+	uint64	current;
+	current = _InterlockedCompareExchange64(&ptr->value, newval, *expected);
+	ret = current == *expected;
+	*expected = current;
+	return ret;
+}
+
+/* Only implemented on 64bit builds */
+#ifdef _WIN64
+#pragma intrinsic(_InterlockedExchangeAdd64)
+
+#define PG_HAVE_ATOMIC_FETCH_ADD_U64
+static inline uint64
+pg_atomic_fetch_add_u64_impl(volatile pg_atomic_uint64 *ptr, int64 add_)
+{
+	return _InterlockedExchangeAdd64(&ptr->value, add_);
+}
+#endif /* _WIN64 */
+
+#endif /* HAVE_ATOMICS */

data/ext/pg_query/include/postgres/port/atomics/generic-sunpro.h

@@ -0,0 +1,106 @@
+/*-------------------------------------------------------------------------
+ *
+ * generic-sunpro.h
+ *	  Atomic operations for solaris' CC
+ *
+ * Portions Copyright (c) 2013-2023, PostgreSQL Global Development Group
+ *
+ * NOTES:
+ *
+ * Documentation:
+ * * manpage for atomic_cas(3C)
+ *   http://www.unix.com/man-page/opensolaris/3c/atomic_cas/
+ *   http://docs.oracle.com/cd/E23824_01/html/821-1465/atomic-cas-3c.html
+ *
+ * src/include/port/atomics/generic-sunpro.h
+ *
+ * -------------------------------------------------------------------------
+ */
+
+#if defined(HAVE_ATOMICS)
+
+#ifdef HAVE_MBARRIER_H
+#include <mbarrier.h>
+
+#define pg_compiler_barrier_impl()	__compiler_barrier()
+
+#ifndef pg_memory_barrier_impl
+/*
+ * Despite the name this is actually a full barrier. Expanding to mfence/
+ * membar #StoreStore | #LoadStore | #StoreLoad | #LoadLoad on x86/sparc
+ * respectively.
+ */
+#	define pg_memory_barrier_impl()		__machine_rw_barrier()
+#endif
+#ifndef pg_read_barrier_impl
+#	define pg_read_barrier_impl()		__machine_r_barrier()
+#endif
+#ifndef pg_write_barrier_impl
+#	define pg_write_barrier_impl()		__machine_w_barrier()
+#endif
+
+#endif /* HAVE_MBARRIER_H */
+
+/* Older versions of the compiler don't have atomic.h... */
+#ifdef HAVE_ATOMIC_H
+
+#include <atomic.h>
+
+#define PG_HAVE_ATOMIC_U32_SUPPORT
+typedef struct pg_atomic_uint32
+{
+	volatile uint32 value;
+} pg_atomic_uint32;
+
+#define PG_HAVE_ATOMIC_U64_SUPPORT
+typedef struct pg_atomic_uint64
+{
+	/*
+	 * Syntax to enforce variable alignment should be supported by versions
+	 * supporting atomic.h, but it's hard to find accurate documentation. If
+	 * it proves to be a problem, we'll have to add more version checks for 64
+	 * bit support.
+	 */
+	volatile uint64 value pg_attribute_aligned(8);
+} pg_atomic_uint64;
+
+#endif /* HAVE_ATOMIC_H */
+
+#endif /* defined(HAVE_ATOMICS) */
+
+
+#if defined(HAVE_ATOMICS)
+
+#ifdef HAVE_ATOMIC_H
+
+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U32
+static inline bool
+pg_atomic_compare_exchange_u32_impl(volatile pg_atomic_uint32 *ptr,
+									uint32 *expected, uint32 newval)
+{
+	bool	ret;
+	uint32	current;
+
+	current = atomic_cas_32(&ptr->value, *expected, newval);
+	ret = current == *expected;
+	*expected = current;
+	return ret;
+}
+
+#define PG_HAVE_ATOMIC_COMPARE_EXCHANGE_U64
+static inline bool
+pg_atomic_compare_exchange_u64_impl(volatile pg_atomic_uint64 *ptr,
+									uint64 *expected, uint64 newval)
+{
+	bool	ret;
+	uint64	current;
+
+	current = atomic_cas_64(&ptr->value, *expected, newval);
+	ret = current == *expected;
+	*expected = current;
+	return ret;
+}
+
+#endif /* HAVE_ATOMIC_H */
+
+#endif /* defined(HAVE_ATOMICS) */

data/ext/pg_query/include/postgres/port/win32/arpa/inet.h

@@ -0,0 +1,3 @@
+/* src/include/port/win32/arpa/inet.h */
+
+#include <sys/socket.h>

data/ext/pg_query/include/postgres/port/win32/dlfcn.h

@@ -0,0 +1 @@
+/* src/include/port/win32/dlfcn.h */

data/ext/pg_query/include/postgres/port/win32/grp.h

@@ -0,0 +1 @@
+/* src/include/port/win32/grp.h */

data/ext/pg_query/include/postgres/port/win32/netdb.h

@@ -0,0 +1,7 @@
+/* src/include/port/win32/netdb.h */
+#ifndef WIN32_NETDB_H
+#define WIN32_NETDB_H
+
+#include <ws2tcpip.h>
+
+#endif

data/ext/pg_query/include/postgres/port/win32/netinet/in.h

@@ -0,0 +1,3 @@
+/* src/include/port/win32/netinet/in.h */
+
+#include <sys/socket.h>

data/ext/pg_query/include/postgres/port/win32/netinet/tcp.h

@@ -0,0 +1,7 @@
+/* src/include/port/win32/netinet/tcp.h */
+#ifndef WIN32_NETINET_TCP_H
+#define WIN32_NETINET_TCP_H
+
+#include <sys/socket.h>
+
+#endif

data/ext/pg_query/include/postgres/port/win32/pwd.h

@@ -0,0 +1,3 @@
+/*
+ * src/include/port/win32/pwd.h
+ */