duckdb · Mytherin · Feb 6, 2026 · Nov 22, 2025 · Nov 22, 2025 · Nov 22, 2025
diff --git a/.github/workflows/Linux.yml b/.github/workflows/Linux.yml
@@ -80,7 +80,7 @@ jobs:
     - name: Setup vcpkg
       uses: lukka/run-vcpkg@v11.1
       with:
-        vcpkgGitCommitId: a42af01b72c28a8e1d7b48107b33e4f286a55ef6
+        vcpkgGitCommitId: 84bab45d415d22042bd0b9081aea57f362da3f35
 
     - name: Build extension
       env:
@@ -92,8 +92,9 @@ jobs:
     - name: Test extension
       env:
         POSTGRES_TEST_DATABASE_AVAILABLE: 1
+        LOCAL_EXTENSION_REPO: 'build/reldebug/repository'
         PGSERVICE: postgres
       run: |
         psql -c "SELECT 43"
         source ./create-postgres-tables.sh
-        make test_reldebug
+        ./build/reldebug/test/unittest --autoloading available
diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml
@@ -14,21 +14,21 @@ concurrency:
 jobs:
   duckdb-stable-build:
     name: Build extension binaries
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: 2323327f4
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
 
   duckdb-stable-deploy:
     name: Deploy extension binaries
     needs: duckdb-stable-build
-    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@v1.4.2
+    uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main
     secrets: inherit
     with:
-      duckdb_version: v1.4.2
-      ci_tools_version: v1.4.2
+      duckdb_version: 2323327f4
+      ci_tools_version: main
       extension_name: postgres_scanner
       exclude_archs: 'wasm_mvp;wasm_eh;wasm_threads;windows_amd64_mingw'
       deploy_latest: ${{ startsWith(github.ref, 'refs/heads/v') || github.ref == 'refs/heads/main' }}
diff --git a/duckdb b/duckdb
diff --git a/extension-ci-tools b/extension-ci-tools
diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
@@ -17,7 +17,8 @@ add_library(
   postgres_scanner.cpp
   postgres_storage.cpp
   postgres_text_reader.cpp
-  postgres_utils.cpp)
+  postgres_utils.cpp
+  postgres_logging.cpp)
 set(ALL_OBJECT_FILES
     ${ALL_OBJECT_FILES} $<TARGET_OBJECTS:postgres_ext_library>
     PARENT_SCOPE)
diff --git a/src/include/postgres_binary_reader.hpp b/src/include/postgres_binary_reader.hpp
@@ -19,7 +19,7 @@
 	~PostgresBinaryReader() override;
 
 public:
-	void BeginCopy(const string &sql) override;
+	void BeginCopy(ClientContext &context, const string &sql) override;
 	PostgresReadResult Read(DataChunk &result) override;
 
 protected:
@@ -41,7 +41,7 @@
 		} else if (sizeof(T) == sizeof(uint32_t)) {
 			val = ntohl(val);
 		} else if (sizeof(T) == sizeof(uint64_t)) {
 			val = ntohll(val);
 		} else {
 			D_ASSERT(0);
 		}

diff --git a/src/include/postgres_connection.hpp b/src/include/postgres_connection.hpp
@@ -45,14 +45,14 @@ class PostgresConnection {
 
 public:
 	static PostgresConnection Open(const string &dsn, const string &attach_path);
-	void Execute(const string &query);
-	unique_ptr<PostgresResult> TryQuery(const string &query, optional_ptr<string> error_message = nullptr);
-	unique_ptr<PostgresResult> Query(const string &query);
+	void Execute(optional_ptr<ClientContext> context, const string &query);
+	unique_ptr<PostgresResult> TryQuery(optional_ptr<ClientContext> context, const string &query, optional_ptr<string> error_message = nullptr);
+	unique_ptr<PostgresResult> Query(optional_ptr<ClientContext> context, const string &query);
 
 	//! Submits a set of queries to be executed in the connection.
-	vector<unique_ptr<PostgresResult>> ExecuteQueries(const string &queries);
+	vector<unique_ptr<PostgresResult>> ExecuteQueries(ClientContext &context, const string &queries);
 
-	PostgresVersion GetPostgresVersion();
+	PostgresVersion GetPostgresVersion(ClientContext &context);
 
 	vector<IndexInfo> GetIndexInfo(const string &table_name);
 
@@ -64,7 +64,7 @@ class PostgresConnection {
 	void CopyChunk(ClientContext &context, PostgresCopyState &state, DataChunk &chunk, DataChunk &varchar_chunk);
 	void FinishCopyTo(PostgresCopyState &state);
 
-	void BeginCopyFrom(const string &query, ExecStatusType expected_result);
+	void BeginCopyFrom(ClientContext &context, const string &query, ExecStatusType expected_result);
 
 	bool IsOpen();
 	void Close();
@@ -87,7 +87,7 @@ class PostgresConnection {
 	static bool DebugPrintQueries();
 
 private:
-	PGresult *PQExecute(const string &query);
+	PGresult *PQExecute(optional_ptr<ClientContext> context, const string &query);
 
 	shared_ptr<OwnedPostgresConnection> connection;
 	string dsn;

diff --git a/src/include/postgres_logging.hpp b/src/include/postgres_logging.hpp
@@ -0,0 +1,20 @@
+
+#pragma once
+
+#include "duckdb/logging/logging.hpp"
+#include "duckdb/common/string_util.hpp"
+
+namespace duckdb {
+
+class PostgresQueryLogType : public LogType {
+public:
+	static constexpr const char *NAME = "PostgresQueryLog";
+	static constexpr LogLevel LEVEL = LogLevel::LOG_DEBUG;
+
+	PostgresQueryLogType() : LogType(NAME, LEVEL, GetLogType()) {};
+
+	static string ConstructLogMessage(const string &str, int64_t duration);
+	static LogicalType GetLogType();
+};
+
+} // namespace
diff --git a/src/include/postgres_result_reader.hpp b/src/include/postgres_result_reader.hpp
@@ -31,7 +31,7 @@ struct PostgresResultReader {
 	}
 
 public:
-	virtual void BeginCopy(const string &sql) = 0;
+	virtual void BeginCopy(ClientContext &context, const string &sql) = 0;
 	virtual PostgresReadResult Read(DataChunk &result) = 0;
 
 protected:

diff --git a/src/include/postgres_text_reader.hpp b/src/include/postgres_text_reader.hpp
@@ -20,7 +20,7 @@ struct PostgresTextReader : public PostgresResultReader {
 	~PostgresTextReader() override;
 
 public:
-	void BeginCopy(const string &sql) override;
+	void BeginCopy(ClientContext &context, const string &sql) override;
 	PostgresReadResult Read(DataChunk &result) override;
 
 private:

diff --git a/src/include/storage/postgres_catalog.hpp b/src/include/storage/postgres_catalog.hpp
@@ -21,7 +21,7 @@ class PostgresSchemaEntry;
 class PostgresCatalog : public Catalog {
 public:
 	explicit PostgresCatalog(AttachedDatabase &db_p, string connection_string, string attach_path,
-	                         AccessMode access_mode, string schema_to_load, PostgresIsolationLevel isolation_level);
+	                         AccessMode access_mode, string schema_to_load, PostgresIsolationLevel isolation_level, ClientContext &context);
 	~PostgresCatalog();
 
 	string connection_string;

diff --git a/src/include/storage/postgres_catalog_set.hpp b/src/include/storage/postgres_catalog_set.hpp
@@ -23,9 +23,9 @@ class PostgresCatalogSet {
 public:
 	PostgresCatalogSet(Catalog &catalog, bool is_loaded);
 
-	optional_ptr<CatalogEntry> GetEntry(PostgresTransaction &transaction, const string &name);
+	optional_ptr<CatalogEntry> GetEntry(ClientContext &context, PostgresTransaction &transaction, const string &name);
 	void DropEntry(PostgresTransaction &transaction, DropInfo &info);
-	void Scan(PostgresTransaction &transaction, const std::function<void(CatalogEntry &)> &callback);
+	void Scan(ClientContext& context, PostgresTransaction &transaction, const std::function<void(CatalogEntry &)> &callback);
 	virtual optional_ptr<CatalogEntry> CreateEntry(PostgresTransaction &transaction, shared_ptr<CatalogEntry> entry);
 	void ClearEntries();
 	virtual bool SupportReload() const {
@@ -34,13 +34,13 @@ class PostgresCatalogSet {
 	virtual optional_ptr<CatalogEntry> ReloadEntry(PostgresTransaction &transaction, const string &name);
 
 protected:
-	virtual void LoadEntries(PostgresTransaction &transaction) = 0;
+	virtual void LoadEntries(ClientContext &context, PostgresTransaction &transaction) = 0;
 	//! Whether or not the catalog set contains dependencies to itself that have
 	//! to be resolved WHILE loading
 	virtual bool HasInternalDependencies() const {
 		return false;
 	}
-	void TryLoadEntries(PostgresTransaction &transaction);
+	void TryLoadEntries(ClientContext &context, PostgresTransaction &transaction);
 
 protected:
 	Catalog &catalog;

diff --git a/src/include/storage/postgres_delete.hpp b/src/include/storage/postgres_delete.hpp
@@ -22,7 +22,7 @@ class PostgresDelete : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;

diff --git a/src/include/storage/postgres_index.hpp b/src/include/storage/postgres_index.hpp
@@ -24,7 +24,7 @@ class PostgresCreateIndex : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;

diff --git a/src/include/storage/postgres_index_set.hpp b/src/include/storage/postgres_index_set.hpp
@@ -26,7 +26,7 @@ class PostgresIndexSet : public PostgresInSchemaSet {
 	                                       TableCatalogEntry &table);
 
 protected:
-	void LoadEntries(PostgresTransaction &transaction) override;
+	void LoadEntries(ClientContext &context, PostgresTransaction &transaction) override;
 
 protected:
 	unique_ptr<PostgresResultSlice> index_result;

diff --git a/src/include/storage/postgres_insert.hpp b/src/include/storage/postgres_insert.hpp
@@ -35,7 +35,7 @@ class PostgresInsert : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;

diff --git a/src/include/storage/postgres_optimizer.hpp b/src/include/storage/postgres_optimizer.hpp
@@ -9,6 +9,7 @@
 #pragma once
 
 #include "duckdb/main/config.hpp"
+#include "duckdb/optimizer/optimizer_extension.hpp"
 
 namespace duckdb {
 

diff --git a/src/include/storage/postgres_schema_set.hpp b/src/include/storage/postgres_schema_set.hpp
@@ -24,7 +24,7 @@ class PostgresSchemaSet : public PostgresCatalogSet {
 	static string GetInitializeQuery(const string &schema = string());
 
 protected:
-	void LoadEntries(PostgresTransaction &transaction) override;
+	void LoadEntries(ClientContext &context, PostgresTransaction &transaction) override;
 
 protected:
 	//! Schema to load - if empty loads all schemas (default behavior)

diff --git a/src/include/storage/postgres_table_set.hpp b/src/include/storage/postgres_table_set.hpp
@@ -26,24 +26,24 @@ class PostgresTableSet : public PostgresInSchemaSet {
 
 	static unique_ptr<PostgresTableInfo> GetTableInfo(PostgresTransaction &transaction, PostgresSchemaEntry &schema,
 	                                                  const string &table_name);
-	static unique_ptr<PostgresTableInfo> GetTableInfo(PostgresConnection &connection, const string &schema_name,
+	static unique_ptr<PostgresTableInfo> GetTableInfo(ClientContext &context, PostgresConnection &connection, const string &schema_name,
 	                                                  const string &table_name);
 	optional_ptr<CatalogEntry> ReloadEntry(PostgresTransaction &transaction, const string &table_name) override;
 
-	void AlterTable(PostgresTransaction &transaction, AlterTableInfo &info);
+	void AlterTable(ClientContext &context, PostgresTransaction &transaction, AlterTableInfo &info);
 
 	static string GetInitializeQuery(const string &schema = string(), const string &table = string());
 
 protected:
-	void LoadEntries(PostgresTransaction &transaction) override;
+	void LoadEntries(ClientContext &context, PostgresTransaction &transaction) override;
 	bool SupportReload() const override {
 		return true;
 	}
 
-	void AlterTable(PostgresTransaction &transaction, RenameTableInfo &info);
-	void AlterTable(PostgresTransaction &transaction, RenameColumnInfo &info);
-	void AlterTable(PostgresTransaction &transaction, AddColumnInfo &info);
-	void AlterTable(PostgresTransaction &transaction, RemoveColumnInfo &info);
+	void AlterTable(ClientContext &context, PostgresTransaction &transaction, RenameTableInfo &info);
+	void AlterTable(ClientContext &context, PostgresTransaction &transaction, RenameColumnInfo &info);
+	void AlterTable(ClientContext &context, PostgresTransaction &transaction, AddColumnInfo &info);
+	void AlterTable(ClientContext &context, PostgresTransaction &transaction, RemoveColumnInfo &info);
 
 	static void AddColumn(optional_ptr<PostgresTransaction> transaction, optional_ptr<PostgresSchemaEntry> schema,
 	                      PostgresResult &result, idx_t row, PostgresTableInfo &table_info);
@@ -55,7 +55,7 @@ class PostgresTableSet : public PostgresInSchemaSet {
 	void CreateEntries(PostgresTransaction &transaction, PostgresResult &result, idx_t start, idx_t end);
 
 private:
-	string GetAlterTablePrefix(PostgresTransaction &transaction, const string &name);
+	string GetAlterTablePrefix(ClientContext &context, PostgresTransaction &transaction, const string &name);
 	string GetAlterTablePrefix(const string &name, optional_ptr<CatalogEntry> entry);
 	string GetAlterTableColumnName(const string &name, optional_ptr<CatalogEntry> entry);
 

diff --git a/src/include/storage/postgres_transaction.hpp b/src/include/storage/postgres_transaction.hpp
@@ -30,12 +30,12 @@ class PostgresTransaction : public Transaction {
 
 	PostgresConnection &GetConnectionWithoutTransaction();
 	PostgresConnection &GetConnection();
-	ClientContext &GetContext();
+	optional_ptr<ClientContext> GetContext();
 
 	string GetDSN();
 	unique_ptr<PostgresResult> Query(const string &query);
 	unique_ptr<PostgresResult> QueryWithoutTransaction(const string &query);
-	vector<unique_ptr<PostgresResult>> ExecuteQueries(const string &queries);
+	vector<unique_ptr<PostgresResult>> ExecuteQueries(ClientContext &context, const string &queries);
 	static PostgresTransaction &Get(ClientContext &context, Catalog &catalog);
 
 	optional_ptr<CatalogEntry> ReferenceEntry(shared_ptr<CatalogEntry> &entry);

diff --git a/src/include/storage/postgres_type_set.hpp b/src/include/storage/postgres_type_set.hpp
@@ -33,7 +33,7 @@ class PostgresTypeSet : public PostgresInSchemaSet {
 		// composite types can refer to other types
 		return true;
 	}
-	void LoadEntries(PostgresTransaction &transaction) override;
+	void LoadEntries(ClientContext &context, PostgresTransaction &transaction) override;
 
 	void CreateEnum(PostgresTransaction &transaction, PostgresResult &result, idx_t start_row, idx_t end_row);
 	void CreateCompositeType(PostgresTransaction &transaction, PostgresResult &result, idx_t start_row, idx_t end_row);

diff --git a/src/include/storage/postgres_update.hpp b/src/include/storage/postgres_update.hpp
@@ -29,7 +29,7 @@ class PostgresUpdate : public PhysicalOperator {
 
 public:
 	// Source interface
-	SourceResultType GetData(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
+	SourceResultType GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const override;
 
 	bool IsSource() const override {
 		return true;

diff --git a/src/postgres_attach.cpp b/src/postgres_attach.cpp
@@ -59,7 +59,7 @@ GROUP BY relname
 ORDER BY relname;
 )",
 	    KeywordHelper::WriteQuoted(data.source_schema));
-	auto res = conn.Query(fetch_table_query);
+	auto res = conn.Query(context, fetch_table_query);
 	for (idx_t row = 0; row < PQntuples(res->res); row++) {
 		auto table_name = res->GetString(row, 0);
 		string query;

diff --git a/src/postgres_binary_reader.cpp b/src/postgres_binary_reader.cpp
@@ -12,8 +12,8 @@ PostgresBinaryReader::~PostgresBinaryReader() {
 	Reset();
 }
 
-void PostgresBinaryReader::BeginCopy(const string &sql) {
-	con.BeginCopyFrom(sql, PGRES_COPY_OUT);
+void PostgresBinaryReader::BeginCopy(ClientContext &context, const string &sql) {
+	con.BeginCopyFrom(context, sql, PGRES_COPY_OUT);
 	if (!Next()) {
 		throw IOException("Failed to fetch header for COPY \"%s\"", sql);
 	}
+8 −6		.github/workflows/TestCITools.yml
+9 −1		.github/workflows/_extension_deploy.yml
+22 −7		.github/workflows/_extension_distribution.yml
+3 −1		README.md
+33 −13		config/distribution_matrix.json
+20 −0		docker/linux_amd64/Dockerfile
+16 −2		docker/linux_amd64_musl/Dockerfile
+20 −0		docker/linux_arm64/Dockerfile
+0 −5		makefiles/c_api_extensions/base.Makefile
+0 −4		makefiles/duckdb_extension.Makefile
+14 −5		scripts/modify_distribution_matrix.py
+0 −11		toolchains/x64-windows-static-md-release-vs2019comp.cmake
+1 −1		vcpkg_ports/vcpkg-cmake/vcpkg.json