Bump to DuckDB 2.0

.github/workflows/IntegrationTests.yml

@@ -45,8 +45,8 @@ jobs:
 
     env:
       GEN: ninja
-      CC: 'ccache gcc'
-      CXX: 'ccache g++'
+      CC: '/usr/lib/ccache/gcc'
+      CXX: '/usr/lib/ccache/g++'
       CCACHE_DIR: ${{ github.workspace }}/ccache
       VCPKG_TARGET_TRIPLET: x64-linux-release
       VCPKG_HOST_TRIPLET: x64-linux-release
@@ -85,7 +85,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+        vcpkgGitCommitId: 9e593bb18ea69cc5095e012465dcd675a822ed0d # Release 2026.07.29
 
     - name: Build extension
       run: |
@@ -98,7 +98,7 @@ jobs:
         key: ${{ steps.cache_key.outputs.value }}
 
     - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
+      uses: ikalnytskyi/action-setup-postgres@v9
       with:
         postgres-version: 17
         username: 'postgres'
@@ -114,6 +114,7 @@ jobs:
         PGUSER: postgres
         PGPASSWORD: postgres
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
+        POSTGRES_CONNECTION_IS_DIRECT: 1
         LOCAL_EXTENSION_REPO: 'build/release/repository'
       run: |
         source ./create-postgres-tables.sh
@@ -128,15 +129,15 @@ jobs:
     strategy:
       matrix:
         postgres:
-        - name: pg-14
-          version: 14
+        - name: pg-15
+          version: 15
         - name: pg-18
           version: 18
 
     env:
       GEN: ninja
-      CC: 'ccache gcc'
-      CXX: 'ccache g++'
+      CC: '/usr/lib/ccache/gcc'
+      CXX: '/usr/lib/ccache/g++'
       CCACHE_DIR: ${{ github.workspace }}/ccache
       VCPKG_TARGET_TRIPLET: x64-linux-release
       VCPKG_HOST_TRIPLET: x64-linux-release
@@ -176,14 +177,14 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+        vcpkgGitCommitId: 9e593bb18ea69cc5095e012465dcd675a822ed0d # Release 2026.07.29
 
     - name: Build extension
       run: |
         make release
 
     - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
+      uses: ikalnytskyi/action-setup-postgres@v9
       with:
         postgres-version: ${{ matrix.postgres.version }}
         username: 'postgres'
@@ -269,8 +270,8 @@ jobs:
 
     env:
       CMAKE_BUILD_PARALLEL_LEVEL: 2
-      CC: 'ccache gcc'
-      CXX: 'ccache g++'
+      CC: '/usr/lib/ccache/gcc'
+      CXX: '/usr/lib/ccache/g++'
       CCACHE_DIR: ${{ github.workspace }}/ccache
       VCPKG_TARGET_TRIPLET: x64-linux-release
       VCPKG_HOST_TRIPLET: x64-linux-release
@@ -310,7 +311,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+        vcpkgGitCommitId: 9e593bb18ea69cc5095e012465dcd675a822ed0d # Release 2026.07.29
 
     - name: Build extension
       env:
@@ -328,7 +329,7 @@ jobs:
         key: ${{ steps.cache_key.outputs.value }}
 
     - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
+      uses: ikalnytskyi/action-setup-postgres@v9
       with:
         postgres-version: 17
         username: 'postgres'
@@ -345,6 +346,8 @@ jobs:
         PGPASSWORD: postgres
         PGSSLMODE: require
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
+        POSTGRES_CONNECTION_IS_DIRECT: 1
+        SANITIZER_BUILD: 1
         LOCAL_EXTENSION_REPO: 'build/relassert/repository'
       run: |
         source ./create-postgres-tables.sh
@@ -420,7 +423,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
+        vcpkgGitCommitId: 9e593bb18ea69cc5095e012465dcd675a822ed0d # Release 2026.07.29
 
     - name: Prepare build tree
       shell: bash
@@ -442,7 +445,7 @@ jobs:
         key: ${{ steps.cache_key.outputs.value }}
 
     - name: Setup Postgres
-      uses: ikalnytskyi/action-setup-postgres@v8
+      uses: ikalnytskyi/action-setup-postgres@v9
       with:
         postgres-version: '17'
         username: 'postgres'
@@ -470,6 +473,7 @@ jobs:
         PGPASSWORD: postgres
         PGSSLMODE: require
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
+        POSTGRES_CONNECTION_IS_DIRECT: 1
         LOCAL_EXTENSION_REPO: 'build/release/repository'
       shell: bash
       run: |

.github/workflows/MainDistributionPipeline.yml

@@ -14,7 +14,6 @@ jobs:
     name: Build extension binaries
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: main
       ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
@@ -27,7 +26,6 @@ jobs:
     uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: main
       ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'

.gitignore

@@ -5,3 +5,5 @@ cmake-build-debug
 .vscode
 .cache
 duckdb_unittest_tempdir
+.envrc
+docker-compose.yml

.gitmodules

@@ -1,6 +1,6 @@
 [submodule "duckdb"]
 	path = duckdb
-	url = https://github.com/duckdb/duckdb.git
+	url = https://github.com/altertable-ai/duckdb
 [submodule "extension-ci-tools"]
 	path = extension-ci-tools
 	url = https://github.com/duckdb/extension-ci-tools.git

CMakeLists.txt

@@ -2,33 +2,22 @@ cmake_minimum_required(VERSION 2.8.12...3.29)
 set(TARGET_NAME postgres_scanner)
 project(${TARGET_NAME})
 
-add_definitions(
-    -DFRONTEND=1
-    -D_GNU_SOURCE=1
-    -DUSE_OPENSSL=1
-    -DHAVE_BIO_GET_DATA=1
-    -DHAVE_BIO_METH_NEW=1)
+add_definitions(-DFRONTEND=1 -D_GNU_SOURCE=1 -DUSE_OPENSSL=1
+                -DHAVE_BIO_GET_DATA=1 -DHAVE_BIO_METH_NEW=1)
 
 find_package(OpenSSL REQUIRED)
 find_package(PostgreSQL REQUIRED)
 
 if(NOT MSVC)
-    add_compile_options(
-        -Wno-pedantic
-        -Wno-sign-compare
-        -Wno-unused-variable)
+  add_compile_options(-Wno-pedantic -Wno-sign-compare -Wno-unused-variable)
 endif()
 
-include_directories(
-    include
-    database-connector/src/include
-    ${OPENSSL_INCLUDE_DIR}
-    ${PostgreSQL_INCLUDE_DIRS})
+include_directories(include database-connector/src/include
+                    ${OPENSSL_INCLUDE_DIR} ${PostgreSQL_INCLUDE_DIRS})
 
 if(WIN32)
-  include_directories(
-      vcpkg_ports/libpq/include/port/win32
-      vcpkg_ports/libpq/include/port/win32_msvc)
+  include_directories(vcpkg_ports/libpq/include/port/win32
+                      vcpkg_ports/libpq/include/port/win32_msvc)
 endif()
 
 add_subdirectory(src)
@@ -40,35 +29,27 @@ set(LOADABLE_EXTENSION_NAME ${TARGET_NAME}_loadable_extension)
 build_static_extension(${TARGET_NAME} ${ALL_OBJECT_FILES})
 build_loadable_extension(${TARGET_NAME} ${PARAMETERS} ${ALL_OBJECT_FILES})
 
-# Fix for ELF symbol conflict when loaded inside PostgreSQL backend
-# Use -Bsymbolic to force the extension to prefer its own symbols over global ones
-# This fixes the pg_link_canary_is_frontend() check failure where calls from within
-# this extension resolve to the backend's version (returns false) instead of ours (returns true)
+# Fix for ELF symbol conflict when loaded inside PostgreSQL backend Use
+# -Bsymbolic to force the extension to prefer its own symbols over global ones
+# This fixes the pg_link_canary_is_frontend() check failure where calls from
+# within this extension resolve to the backend's version (returns false) instead
+# of ours (returns true)
 if(NOT WIN32 AND NOT APPLE)
-    target_link_options(${LOADABLE_EXTENSION_NAME} PRIVATE
-        "-Wl,-Bsymbolic"
-    )
+  target_link_options(${LOADABLE_EXTENSION_NAME} PRIVATE "-Wl,-Bsymbolic")
 endif()
 
-target_link_libraries(${LOADABLE_EXTENSION_NAME}
-    OpenSSL::SSL
-    OpenSSL::Crypto
-    PostgreSQL::PostgreSQL
-    ${CURL_LIBRARIES})
+target_link_libraries(${LOADABLE_EXTENSION_NAME} OpenSSL::SSL OpenSSL::Crypto
+                      PostgreSQL::PostgreSQL ${CURL_LIBRARIES})
 set_property(TARGET ${EXTENSION_NAME} PROPERTY C_STANDARD 99)
 set_property(TARGET ${LOADABLE_EXTENSION_NAME} PROPERTY C_STANDARD 99)
 
 if(WIN32)
-  target_link_libraries(${LOADABLE_EXTENSION_NAME}
-      wsock32
-      ws2_32
-      wldap32
-      secur32
-      crypt32)
+  target_link_libraries(${LOADABLE_EXTENSION_NAME} wsock32 ws2_32 wldap32
+                        secur32 crypt32)
 endif()
 
 install(
-    TARGETS ${EXTENSION_NAME}
-    EXPORT "${DUCKDB_EXPORT_SET}"
-    LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
-    ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")
+  TARGETS ${EXTENSION_NAME}
+  EXPORT "${DUCKDB_EXPORT_SET}"
+  LIBRARY DESTINATION "${INSTALL_LIB_DIR}"
+  ARCHIVE DESTINATION "${INSTALL_LIB_DIR}")

README.md

@@ -52,6 +52,19 @@ D SELECT * FROM postgres_db.uuids;
 
 For more information on how to use the connector, refer to the [Postgres documentation on the website](https://duckdb.org/docs/extensions/postgres).
 
+### Connection Pooling
+
+By default, the extension opens a new connection whenever none are idle. Behind a transaction-mode pooler (e.g. PgBouncer `pool_mode=transaction`), this can exceed the pooler's own pool size under load and hang. If that applies to you, cap and wait instead:
+
+```sql
+SET pg_pool_acquire_mode = 'wait';
+SET pg_pool_max_connections = 16;        -- ~80-90% of your pooler's pool size
+
+ATTACH 'host=pgbouncer-host port=6432 dbname=mydb' AS postgres_db (TYPE postgres);
+```
+
+Note that `SET` statements are global and only apply pre-`ATTACH`. To change pooling on an already-attached database, use `postgres_configure_pool(catalog_name=...)` instead. Leave `force` mode if you connect directly to Postgres or through a session-mode pooler.
+
 ### AWS RDS IAM Authentication
 
 The extension supports AWS RDS IAM-based authentication, which allows you to connect to RDS/Aurora PostgreSQL instances using IAM database authentication instead of static passwords. This feature automatically generates temporary authentication tokens using the AWS SDK.

create-postgres-tables.sh

@@ -24,13 +24,14 @@ CALL dbgen(sf=0.01, schema='tpch');
 CALL dsdgen(sf=0.01, schema='tpcds');
 EXPORT DATABASE '${ABS_DIR_PREFIX}/postgresscannertmp';
 " | \
-$DUCKDB_PATH
+$DUCKDB_PATH -unsigned
 
 dropdb --if-exists postgresscanner
 createdb postgresscanner
 
 psql -d postgresscanner < ${ABS_DIR_PREFIX}/postgresscannertmp/schema.sql
-psql -d postgresscanner < ${ABS_DIR_PREFIX}/postgresscannertmp/load.sql
+sed -E "s/,\s*allow_quoted_nulls\s+[^,)]+//g" ${ABS_DIR_PREFIX}/postgresscannertmp/load.sql > ${ABS_DIR_PREFIX}/postgresscannertmp/load_filtered.sql
+psql -d postgresscanner < ${ABS_DIR_PREFIX}/postgresscannertmp/load_filtered.sql
 rm -rf ${ABS_DIR_PREFIX}/postgresscannertmp
 
 psql -d postgresscanner < test/all_pg_types.sql

extension_config.cmake

@@ -3,7 +3,6 @@
 # Extension from this repo
 duckdb_extension_load(postgres_scanner
     SOURCE_DIR ${CMAKE_CURRENT_LIST_DIR}
-    DONT_LINK
 )
 
 duckdb_extension_load(tpch)

scripts/win_resources.patch

@@ -1,8 +1,8 @@
 diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
-index 24afa3db42..d3f04aed2d 100644
+index 9dd2ea45d2..a583df2d9a 100644
 --- a/src/CMakeLists.txt
 +++ b/src/CMakeLists.txt
-@@ -130,7 +130,6 @@ if(WIN32 AND NOT MINGW)
+@@ -132,7 +132,6 @@ if(WIN32 AND NOT MINGW)
    set(CMAKE_RC_FLAGS
        "${CMAKE_RC_FLAGS} -D DUCKDB_DEV_ITERATION=\"${RC_DEV_ITERATION}\"")
 
@@ -11,14 +11,14 @@ index 24afa3db42..d3f04aed2d 100644
 
  install(
 diff --git a/tools/shell/CMakeLists.txt b/tools/shell/CMakeLists.txt
-index 0d26359008..04c5c7f01f 100644
+index 7c376be703..956a2df514 100644
 --- a/tools/shell/CMakeLists.txt
 +++ b/tools/shell/CMakeLists.txt
-@@ -77,7 +77,6 @@ if(WIN32 AND NOT MINGW)
+@@ -74,7 +74,6 @@ if(WIN32 AND NOT MINGW)
        "${CMAKE_RC_FLAGS} -D DUCKDB_DEV_ITERATION=\"${RC_DEV_ITERATION}\"")
    set(CMAKE_RC_FLAGS
        "${CMAKE_RC_FLAGS} -D DUCKDB_COPYRIGHT_YEAR=\"${DUCKDB_COPYRIGHT_YEAR}\"")
 -  target_sources(shell PRIVATE rc/duckdb.rc)
- endif()
-
- set_target_properties(shell PROPERTIES OUTPUT_NAME duckdb)
+   # Opt into the Windows Segment Heap to avoid the default NT heap's lock
+   # contention under multi-threaded allocation (see #24027). CMake merges
+   # .manifest sources into the linker manifest via mt.exe.

src/CMakeLists.txt

@@ -5,20 +5,20 @@ add_subdirectory(storage)
 
 add_library(
   postgres_ext_library OBJECT
-  postgres_attach.cpp
   postgres_aws.cpp
   postgres_binary_copy.cpp
   postgres_binary_file_reader.cpp
   postgres_binary_parser.cpp
   postgres_binary_reader.cpp
+  postgres_connection_string.cpp
   postgres_connection.cpp
   postgres_copy_from.cpp
   postgres_copy_to.cpp
-  postgres_execute.cpp
   postgres_extension.cpp
   postgres_filter_pushdown.cpp
   postgres_hstore.cpp
   postgres_parameters.cpp
+  postgres_pin_connection.cpp
   postgres_query.cpp
   postgres_scanner.cpp
   postgres_secrets.cpp

src/dbconnector/CMakeLists.txt

@@ -3,12 +3,13 @@ set(POSTGRES_DBCONNECTOR_PATH
 
 add_library(
   postgres_ext_dbconnector OBJECT
+  ${POSTGRES_DBCONNECTOR_PATH}/src/attached/attached_catalog.cpp
+  ${POSTGRES_DBCONNECTOR_PATH}/src/attached/attached_table.cpp
+  ${POSTGRES_DBCONNECTOR_PATH}/src/functions/configure_pool.cpp
   ${POSTGRES_DBCONNECTOR_PATH}/src/query/query_writer.cpp
   ${POSTGRES_DBCONNECTOR_PATH}/src/table_scan/filter_pushdown.cpp
   ${POSTGRES_DBCONNECTOR_PATH}/src/table_scan/filter_util.cpp
-  ${POSTGRES_DBCONNECTOR_PATH}/src/optimizer/aggregate_optimizer.cpp
-  ${POSTGRES_DBCONNECTOR_PATH}/src/optimizer/optimizer_util.cpp
-  ${POSTGRES_DBCONNECTOR_PATH}/src/optimizer/order_by_and_limit_optimizer.cpp)
+  ${POSTGRES_DBCONNECTOR_PATH}/src/optimizer/optimizer_util.cpp)
 
 set(ALL_OBJECT_FILES
     ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:postgres_ext_dbconnector>

src/include/postgres_aws.hpp

@@ -9,6 +9,7 @@
 #pragma once
 
 #include <cstdint>
+#include "duckdb/main/attached_database.hpp"
 #include <string>
 
 #include "duckdb.hpp"