Extension fixes

awitten1 · Apr 19, 2024 · d78effa · d78effa
1 parent 2bbebda
commit d78effa
Show file tree

Hide file tree

Showing 3 changed files with 55 additions and 0 deletions.
diff --git a/.github/config/out_of_tree_extensions.cmake b/.github/config/out_of_tree_extensions.cmake
@@ -94,6 +94,7 @@ duckdb_extension_load(sqlite_scanner
         ${STATIC_LINK_SQLITE} LOAD_TESTS
         GIT_URL https://github.com/duckdb/sqlite_scanner
         GIT_TAG 091197efb34579c7195afa43dfb5925023c915c0
+        APPLY_PATCHES
         )
 
 ################# SUBSTRAIT

diff --git a/.github/patches/extensions/postgres_scanner/shared_ptr.patch b/.github/patches/extensions/postgres_scanner/shared_ptr.patch
@@ -58,6 +58,19 @@ index e20a803..4fe45f6 100644
 
  namespace duckdb {
  struct DropInfo;
+diff --git a/src/include/storage/postgres_table_entry.hpp b/src/include/storage/postgres_table_entry.hpp
+index d96dfad..529c234 100644
+--- a/src/include/storage/postgres_table_entry.hpp
++++ b/src/include/storage/postgres_table_entry.hpp
+@@ -50,7 +50,7 @@ public:
+
+ 	TableStorageInfo GetStorageInfo(ClientContext &context) override;
+
+-	void BindUpdateConstraints(LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
++	void BindUpdateConstraints(Binder &binder, LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
+ 	                           ClientContext &context) override;
+
+ 	//! Get the copy format (text or binary) that should be used when writing data to this table
 diff --git a/src/postgres_binary_copy.cpp b/src/postgres_binary_copy.cpp
 index f0d86a3..4c89c3f 100644
 --- a/src/postgres_binary_copy.cpp
@@ -212,3 +225,17 @@ index 93c3f28..cd3b46f 100644
 
  namespace duckdb {
 
+diff --git a/src/storage/postgres_table_entry.cpp b/src/storage/postgres_table_entry.cpp
+index d791678..7ba1ad6 100644
+--- a/src/storage/postgres_table_entry.cpp
++++ b/src/storage/postgres_table_entry.cpp
+@@ -31,7 +31,8 @@ unique_ptr<BaseStatistics> PostgresTableEntry::GetStatistics(ClientContext &cont
+ 	return nullptr;
+ }
+
+-void PostgresTableEntry::BindUpdateConstraints(LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {
++void PostgresTableEntry::BindUpdateConstraints(Binder &binder, LogicalGet &, LogicalProjection &, LogicalUpdate &,
++											   ClientContext &) {
+ }
+
+ TableFunction PostgresTableEntry::GetScanFunction(ClientContext &context, unique_ptr<FunctionData> &bind_data) {
diff --git a/.github/patches/extensions/sqlite_scanner/binder_update.patch b/.github/patches/extensions/sqlite_scanner/binder_update.patch
@@ -0,0 +1,27 @@
+diff --git a/src/include/storage/sqlite_table_entry.hpp b/src/include/storage/sqlite_table_entry.hpp
+index 6e64d55..b08319b 100644
+--- a/src/include/storage/sqlite_table_entry.hpp
++++ b/src/include/storage/sqlite_table_entry.hpp
+@@ -25,7 +25,7 @@ public:
+
+ 	TableStorageInfo GetStorageInfo(ClientContext &context) override;
+
+-	void BindUpdateConstraints(LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
++	void BindUpdateConstraints(Binder &binder, LogicalGet &get, LogicalProjection &proj, LogicalUpdate &update,
+ 	                           ClientContext &context) override;
+ };
+
+diff --git a/src/storage/sqlite_table_entry.cpp b/src/storage/sqlite_table_entry.cpp
+index fadbb39..47378b0 100644
+--- a/src/storage/sqlite_table_entry.cpp
++++ b/src/storage/sqlite_table_entry.cpp
+@@ -16,7 +16,8 @@ unique_ptr<BaseStatistics> SQLiteTableEntry::GetStatistics(ClientContext &contex
+ 	return nullptr;
+ }
+
+-void SQLiteTableEntry::BindUpdateConstraints(LogicalGet &, LogicalProjection &, LogicalUpdate &, ClientContext &) {
++void SQLiteTableEntry::BindUpdateConstraints(Binder &, LogicalGet &, LogicalProjection &, LogicalUpdate &,
++											 ClientContext &) {
+ }
+
+ TableFunction SQLiteTableEntry::GetScanFunction(ClientContext &context, unique_ptr<FunctionData> &bind_data) {