Bump libpg_query from 15-latest to 17-latest

c_src/libpg_query/.gitattributes

@@ -0,0 +1 @@
+*.sql binary

c_src/libpg_query/.github/workflows/ci.yml

@@ -14,26 +14,26 @@ jobs:
         valgrind: [valgrind,no-valgrind]
     steps:
     - name: Check out code
-      uses: actions/checkout@v2
+      uses: actions/checkout@v4
     - name: Cache protobuf library
       if: matrix.protobuf_lib == 'protobuf-cpp'
       id: cache-protobuf
-      uses: actions/cache@v1
+      uses: actions/cache@v4
       with:
-        path: protobuf-3.14.0
-        key: ${{ runner.os }}-protobuf-cpp-3.14.0
+        path: protobuf-25.1
+        key: ${{ runner.os }}-protobuf-25.1
     - name: Build protobuf library
       if: matrix.protobuf_lib == 'protobuf-cpp' && steps.cache-protobuf.outputs.cache-hit != 'true'
       run: |
-        wget https://github.com/protocolbuffers/protobuf/releases/download/v3.14.0/protobuf-cpp-3.14.0.tar.gz
-        tar -xf protobuf-cpp-3.14.0.tar.gz
-        cd protobuf-3.14.0
-        ./configure
-        make
+        git clone --depth 1 --branch v25.1 https://github.com/protocolbuffers/protobuf.git protobuf-25.1
+        cd protobuf-25.1
+        git submodule update --init --recursive
+        cmake .
+        cmake --build . --parallel 10
     - name: Install protobuf library
       if: matrix.protobuf_lib == 'protobuf-cpp'
       run: |
-        cd protobuf-3.14.0
+        cd protobuf-25.1
         sudo make install
         sudo ldconfig
     - name: Install Valgrind
@@ -71,3 +71,47 @@ jobs:
       run: make $FLAGS
       env:
         FLAGS: ${{ format('{0} {1} {2}', steps.make_flags.outputs.proto_flags, steps.make_flags.outputs.compiler_flags, steps.make_flags.outputs.debug_flags) }}
+  build_macos:
+    runs-on: macos-latest
+    steps:
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Build and run tests
+      run: make
+  build_windows_msvc:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        arch: [x64, x86]
+    steps:
+    - name: Configure MSVC developer console
+      uses: ilammy/msvc-dev-cmd@v1
+      with:
+        arch: ${{ matrix.arch }}
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Build and run tests
+      run: nmake /F Makefile.msvc
+  build_windows_msys2:
+    runs-on: windows-latest
+    strategy:
+      fail-fast: false
+      matrix:
+        sys: [mingw64, mingw32, ucrt64, clang64]
+    steps:
+    - name: Set up MSYS2 and compiler
+      uses: msys2/setup-msys2@v2
+      with:
+        msystem: ${{matrix.sys}}
+        pacboy: >-
+          toolchain:p
+        install: >-
+          make
+          diffutils
+    - name: Check out code
+      uses: actions/checkout@v4
+    - name: Build and run tests
+      shell: msys2 {0}
+      run: |
+        make

c_src/libpg_query/.gitignore

@@ -3,6 +3,8 @@ postgres.tar.bz2
 
 *.o
 *.a
+*.obj
+pg_query.lib
 
 examples/*
 !examples/*.c
@@ -17,3 +19,5 @@ test/*.dSYM
 
 tmp/*
 !tmp/.gitkeep
+
+.vs/*

c_src/libpg_query/CHANGELOG.md

@@ -2,6 +2,77 @@
 
 All versions are tagged by the major Postgres version, plus an individual semver for this library itself.
 
+## 17-6.1.0   2025-04-02
+
+* Update to Postgres 17.4, and add recent patches scheduled for Postgres 17.5 (not yet released)
+  - Notably, this pulls in support for macOS 15.4 which defines strchrnul
+    in its standard library, fixing builds on up-to-date macOS versions.
+- Deparser improvements
+  - Add parenthesis around AT LOCAL / AT TIMEZONE if needed
+  - Correctness improvements related to expressions and function calls
+
+## 17-6.0.0   2024-09-27
+
+* Upgrade to Postgres 17
+* Deparser:
+  - Add support for deparsing `JSON_TABLE`, `JSON_QUERY`, `JSON_EXISTS`, `JSON_VALUE`
+  - Add support for deparsing `JSON`, `JSON_SCALAR`, `JSON_SERIALIZE`
+  - Add support for deparsing `COPY ... FORCE_NULL(*)`
+  - Add support for deparsing `ALTER COLUMN ... SET EXPRESSION AS`
+  - Add support for deparsing `SET STATISTICS DEFAULT`
+  - Add support for deparsing `SET ACCESS METHOD DEFAULT`
+  - Add support for deparsing `... AT LOCAL`
+  - Add support for deparsing `merge_action()`
+  - Add support for deparsing `MERGE ... RETURNING`
+  - Add support for deparsing `NOT MATCHED [ BY TARGET ]`
+
+## 16-5.1.0   2024-01-08
+
+* Add support for compiling on Windows
+  - In order to build on Windows when using MSVC, use the new "Makefile.msvc"
+    with nmake, or directly compile all .c files in the src folder into a library
+  - If compiling directly, add src/postgres/include/port/win32 to the include path,
+    and when using MSVC also add src/postgres/include/port/win32_msvc
+* Add support for compiling on 32-bit systems
+  - The relevant code is enabled at compile time by checking the pointer
+    size (__SIZEOF_POINTER__ == 4)
+* Move internal headers and included .c files to src/include folder
+  - This avoids having any .c files in the top-level src/ folder that can't
+    be directly compiled, and thus lets us simplify the logic for defining
+    which source units are to be compiled.
+* Remove strnlen fallback implementation
+* Avoid use of mmap, asprintf and strndup to improve portability
+* Improve compatibility with non-POSIX systems and C89 compilers
+
+## 16-5.0.0   2023-12-22
+
+* Update to Postgres 16.1
+* Drop support for arbitrary trailing junk on integer literals
+  - Support for parsing junk after parameters, e.g. `$1OR` is retained
+* Deparser:
+  - Fix deparsing of `SYSTEM_USER`
+  - Add support for deparsing `STORAGE` mode
+  - Add support for deparsing `REVOKE ... CASCADE`
+  - Rework a_expr/b_expr/c_expr deparsing to match gram.y structure
+  - Add support for deparsing `COMPRESSION` option for columns
+  - Add support for deparsing `NULLS NOT DISTINCT` in unique constraints
+  - Add support for deparsing new SQL/JSON functionality
+
+## 15-4.2.4   2023-12-20
+
+* Scanner: Add token `ASCII_36` ("$") to support queries like "SELECT $identifier" [#211](https://github.com/pganalyze/libpg_query/pull/211), [#219](https://github.com/pganalyze/libpg_query/pull/219)
+  - Whilst these queries are not valid SQL and would fail parsing, this token can show up when using `pg_query_scan` or `pg_query_split_with_scanner` directly
+* Normalize: Fix incorrect type cast [#223](https://github.com/pganalyze/libpg_query/pull/223)
+* Deparser:
+  - Fix some `BooleanTest` cases [#206](https://github.com/pganalyze/libpg_query/issues/206)
+  - Fix `ALTER TABLE ... ENABLE TRIGGER ALL` [#222](https://github.com/pganalyze/libpg_query/pull/222)
+  - Add parens around type casts in `IndexElem` [#214](https://github.com/pganalyze/libpg_query/pull/214)
+  - Treat type casts in `func_expr_windowless` as functions [#214](https://github.com/pganalyze/libpg_query/pull/214)
+* Support changing parse mode and config settings affecting the parser [#216](https://github.com/pganalyze/libpg_query/pull/216)
+  - Alternate parse modes are useful for parsing PL/pgSQL expressions, as well as type names
+  - Additionally, you can now change config settings that affect parsing, like `standard_conforming_strings`
+  - To pass options, use the new methods ending in `_opts`, e.g. `pg_query_parse_opts`
+
 ## 15-4.2.3   2023-07-07
 
 * Fix builds when compiling with `glibc >=  2.38` [#203](https://github.com/pganalyze/libpg_query/pull/203)