forked from duckdb/duckdb
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge remote-tracking branch 'upstream/main'
- Loading branch information
Showing
67 changed files
with
820 additions
and
418 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,20 @@ | ||
diff --git a/duckdb b/duckdb | ||
index 3196df7..9723c96 160000 | ||
--- a/duckdb | ||
+++ b/duckdb | ||
@@ -1 +1 @@ | ||
-Subproject commit 3196df79cecac38c867af084f19924c78dfc9d29 | ||
+Subproject commit 9723c96c284735e759138cedc5b00b282c2f2bec | ||
diff --git a/src/arrow_scan_ipc.cpp b/src/arrow_scan_ipc.cpp | ||
index e3bf858..5e45013 100644 | ||
--- a/src/arrow_scan_ipc.cpp | ||
+++ b/src/arrow_scan_ipc.cpp | ||
@@ -54,7 +54,7 @@ unique_ptr <FunctionData> ArrowIPCTableFunction::ArrowScanBind(ClientContext &co | ||
|
||
// TODO Everything below this is identical to the bind in duckdb/src/function/table/arrow.cpp | ||
auto &data = *res; | ||
- stream_factory_get_schema(stream_factory_ptr, data.schema_root); | ||
+ stream_factory_get_schema((ArrowArrayStream *) stream_factory_ptr, data.schema_root.arrow_schema); | ||
for (idx_t col_idx = 0; col_idx < (idx_t) data.schema_root.arrow_schema.n_children; col_idx++) { | ||
auto &schema = *data.schema_root.arrow_schema.children[col_idx]; | ||
if (!schema.release) { |
15 changes: 15 additions & 0 deletions
15
.github/patches/extensions/postgres_scanner/default_value.patch
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,15 @@ | ||
diff --git a/src/storage/postgres_table_set.cpp b/src/storage/postgres_table_set.cpp | ||
index 88786cf..bfd37ab 100644 | ||
--- a/src/storage/postgres_table_set.cpp | ||
+++ b/src/storage/postgres_table_set.cpp | ||
@@ -205,8 +205,8 @@ string PostgresColumnsToSQL(const ColumnList &columns, const vector<unique_ptr<C | ||
} | ||
if (column.Generated()) { | ||
ss << " GENERATED ALWAYS AS(" << column.GeneratedExpression().ToString() << ")"; | ||
- } else if (column.DefaultValue()) { | ||
- ss << " DEFAULT(" << column.DefaultValue()->ToString() << ")"; | ||
+ } else if (column.HasDefaultValue()) { | ||
+ ss << " DEFAULT(" << column.DefaultValue().ToString() << ")"; | ||
} | ||
} | ||
// print any extra constraints that still need to be printed |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
diff --git a/src/to_substrait.cpp b/src/to_substrait.cpp | ||
index 7ca777e..bac1f35 100644 | ||
--- a/src/to_substrait.cpp | ||
+++ b/src/to_substrait.cpp | ||
@@ -1058,11 +1058,11 @@ substrait::Rel *DuckDBToSubstrait::TransformGet(LogicalOperator &dop) { | ||
substrait::Rel *rel = get_rel; | ||
auto &dget = (LogicalGet &)dop; | ||
|
||
- if (!dget.function.get_batch_info) { | ||
+ if (!dget.function.get_bind_info) { | ||
throw NotImplementedException("This Scanner Type can't be used in substrait because a get batch info " | ||
"is not yet implemented"); | ||
} | ||
- auto bind_info = dget.function.get_batch_info(dget.bind_data.get()); | ||
+ auto bind_info = dget.function.get_bind_info(dget.bind_data.get()); | ||
auto sget = get_rel->mutable_read(); | ||
|
||
if (!dget.table_filters.filters.empty()) { |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.