diff --git a/.github/workflows/MainDistributionPipeline.yml b/.github/workflows/MainDistributionPipeline.yml index c98f93b..90c1927 100644 --- a/.github/workflows/MainDistributionPipeline.yml +++ b/.github/workflows/MainDistributionPipeline.yml @@ -16,9 +16,10 @@ jobs: name: Build extension binaries uses: duckdb/extension-ci-tools/.github/workflows/_extension_distribution.yml@main with: - duckdb_version: main + duckdb_version: v1.5-variegata extension_name: sqlite_scanner ci_tools_version: main + opt_in_archs: 'linux_amd64_musl;linux_arm64_musl;windows_arm64' duckdb-stable-deploy: name: Deploy extension binaries @@ -26,8 +27,9 @@ jobs: uses: duckdb/extension-ci-tools/.github/workflows/_extension_deploy.yml@main secrets: inherit with: - duckdb_version: main + duckdb_version: v1.5-variegata extension_name: sqlite_scanner ci_tools_version: main + opt_in_archs: 'linux_amd64_musl;linux_arm64_musl;windows_arm64' deploy_latest: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} deploy_versioned: ${{ startsWith(github.ref, 'refs/tags/v') || github.ref == 'refs/heads/main' }} diff --git a/duckdb b/duckdb index 9ff9e49..f480e78 160000 --- a/duckdb +++ b/duckdb @@ -1 +1 @@ -Subproject commit 9ff9e49b70252ee4584eda6bc696ffa7864b0e19 +Subproject commit f480e781694b03105c9281d2564f08adb9a8d4a8 diff --git a/extension-ci-tools b/extension-ci-tools index ba18d4f..fccd748 160000 --- a/extension-ci-tools +++ b/extension-ci-tools @@ -1 +1 @@ -Subproject commit ba18d4f106a6cc1d5597f442bac06a1d7db098ef +Subproject commit fccd748f513d018a6cb2b6e4223cec85aaa280fc diff --git a/src/sqlite_extension.cpp b/src/sqlite_extension.cpp index 5161298..0fac9c1 100644 --- a/src/sqlite_extension.cpp +++ b/src/sqlite_extension.cpp @@ -37,7 +37,7 @@ static void LoadInternal(ExtensionLoader &loader) { config.AddExtensionOption("sqlite_debug_show_queries", "DEBUG SETTING: print all queries sent to SQLite to stdout", LogicalType::BOOLEAN, Value::BOOLEAN(false), SetSqliteDebugQueryPrint); - config.storage_extensions["sqlite_scanner"] = make_uniq(); + StorageExtension::Register(config, "sqlite_scanner", make_shared_ptr()); } void SqliteScannerExtension::Load(ExtensionLoader &loader) { diff --git a/src/storage/sqlite_schema_entry.cpp b/src/storage/sqlite_schema_entry.cpp index 9657797..d0b7fa3 100644 --- a/src/storage/sqlite_schema_entry.cpp +++ b/src/storage/sqlite_schema_entry.cpp @@ -12,6 +12,7 @@ #include "duckdb/parser/parsed_data/alter_info.hpp" #include "duckdb/parser/parsed_data/alter_table_info.hpp" #include "duckdb/parser/parsed_expression_iterator.hpp" +#include "duckdb/parser/expression/columnref_expression.hpp" namespace duckdb {