diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index b1ea791eb..d29273b44 100644 --- 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@v1.5.0 with: - duckdb_version: v1.4.2 - ci_tools_version: v1.4.2 + duckdb_version: v1.5.0 + ci_tools_version: v1.5.0 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@v1.5.0 secrets: inherit with: - duckdb_version: v1.4.2 - ci_tools_version: v1.4.2 + duckdb_version: v1.5.0 + ci_tools_version: v1.5.0 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 index 68d7555f6..3dbdcdadc 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 68d7555f68bd25c1a251ccca2e6338949c33986a +Subproject commit 3dbdcdadcd35a648e5d0c3ce7f5e309fd7dc4524 diff --git a/src/include/storage/postgres_delete.hpp b/src/include/storage/postgres_delete.hpp index e709ceed1..4e878de01 100644 --- 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 index 47c46c0d4..76593a023 100644 --- 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_insert.hpp b/src/include/storage/postgres_insert.hpp index d22b4f195..4bd0e2991 100644 --- 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_update.hpp b/src/include/storage/postgres_update.hpp index 12b5e5e7a..dd25e7594 100644 --- 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_storage.cpp b/src/postgres_storage.cpp index cfff7466e..7963170cb 100644 --- a/src/postgres_storage.cpp +++ b/src/postgres_storage.cpp @@ -1,5 +1,5 @@ #include "duckdb.hpp" - +#include "duckdb/main/settings.hpp" #include "postgres_storage.hpp" #include "storage/postgres_catalog.hpp" #include "duckdb/parser/parsed_data/attach_info.hpp" @@ -10,8 +10,7 @@ namespace duckdb { static unique_ptr PostgresAttach(optional_ptr storage_info, ClientContext &context, AttachedDatabase &db, const string &name, AttachInfo &info, AttachOptions &attach_options) { - auto &config = DBConfig::GetConfig(context); - if (!config.options.enable_external_access) { + if (!Settings::Get(context)) { throw PermissionException("Attaching Postgres databases is disabled through configuration"); } string attach_path = info.path; diff --git a/src/storage/postgres_delete.cpp b/src/storage/postgres_delete.cpp index 8e1c01437..b50fbc171 100644 --- a/src/storage/postgres_delete.cpp +++ b/src/storage/postgres_delete.cpp @@ -96,7 +96,7 @@ SinkFinalizeType PostgresDelete::Finalize(Pipeline &pipeline, Event &event, Clie //===--------------------------------------------------------------------===// // GetData //===--------------------------------------------------------------------===// -SourceResultType PostgresDelete::GetData(ExecutionContext &context, DataChunk &chunk, +SourceResultType PostgresDelete::GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const { auto &insert_gstate = sink_state->Cast(); chunk.SetCardinality(1); diff --git a/src/storage/postgres_index.cpp b/src/storage/postgres_index.cpp index d2de80e06..eae13de59 100644 --- a/src/storage/postgres_index.cpp +++ b/src/storage/postgres_index.cpp @@ -20,7 +20,7 @@ PostgresCreateIndex::PostgresCreateIndex(PhysicalPlan &physical_plan, unique_ptr //===--------------------------------------------------------------------===// // Source //===--------------------------------------------------------------------===// -SourceResultType PostgresCreateIndex::GetData(ExecutionContext &context, DataChunk &chunk, +SourceResultType PostgresCreateIndex::GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const { auto &catalog = table.catalog; auto &schema = table.schema; diff --git a/src/storage/postgres_insert.cpp b/src/storage/postgres_insert.cpp index e3961e4f9..385351df7 100644 --- a/src/storage/postgres_insert.cpp +++ b/src/storage/postgres_insert.cpp @@ -148,7 +148,7 @@ SinkFinalizeType PostgresInsert::Finalize(Pipeline &pipeline, Event &event, Clie //===--------------------------------------------------------------------===// // GetData //===--------------------------------------------------------------------===// -SourceResultType PostgresInsert::GetData(ExecutionContext &context, DataChunk &chunk, +SourceResultType PostgresInsert::GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const { auto &insert_gstate = sink_state->Cast(); chunk.SetCardinality(1); diff --git a/src/storage/postgres_update.cpp b/src/storage/postgres_update.cpp index 8c3b8a305..6a22b81b9 100644 --- a/src/storage/postgres_update.cpp +++ b/src/storage/postgres_update.cpp @@ -177,7 +177,7 @@ SinkFinalizeType PostgresUpdate::Finalize(Pipeline &pipeline, Event &event, Clie //===--------------------------------------------------------------------===// // GetData //===--------------------------------------------------------------------===// -SourceResultType PostgresUpdate::GetData(ExecutionContext &context, DataChunk &chunk, +SourceResultType PostgresUpdate::GetDataInternal(ExecutionContext &context, DataChunk &chunk, OperatorSourceInput &input) const { auto &insert_gstate = sink_state->Cast(); chunk.SetCardinality(1);