duckdb 0.4.1-dev152.0 → 0.4.1-dev169.0

package/package.json

@@ -1,7 +1,7 @@
 {
   "name": "duckdb",
   "main": "./lib/duckdb.js",
-  "version": "0.4.1-dev152.0",
+  "version": "0.4.1-dev169.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/data_chunk.cpp

@@ -182,4 +182,4 @@ Napi::Array EncodeDataChunk(Napi::Env env, duckdb::DataChunk &chunk, bool with_t
 	return col_descs;
 }
 
-} // namespace node_duckdb
+} // namespace node_duckdb

package/src/duckdb.cpp

@@ -105380,7 +105380,7 @@ typedef unique_ptr<ArrowArrayStreamWrapper> (*stream_factory_produce_t)(
     TableFilterSet *filters);
 typedef void (*stream_factory_get_schema_t)(uintptr_t stream_factory_ptr, ArrowSchemaWrapper &schema);
 
-struct ArrowScanFunctionData : public TableFunctionData {
+struct ArrowScanFunctionData : public PyTableFunctionData {
 	ArrowScanFunctionData(idx_t rows_per_thread_p, stream_factory_produce_t scanner_producer_p,
 	                      uintptr_t stream_factory_ptr_p)
 	    : lines_read(0), rows_per_thread(rows_per_thread_p), stream_factory_ptr(stream_factory_ptr_p),
@@ -169833,6 +169833,10 @@ unique_ptr<BoundTableRef> Binder::Bind(TableFunctionRef &ref) {
 		TableFunctionBindInput bind_input(parameters, named_parameters, input_table_types, input_table_names,
 		                                  table_function.function_info.get());
 		bind_data = table_function.bind(context, bind_input, return_types, return_names);
+		if (table_function.name == "pandas_scan" || table_function.name == "arrow_scan") {
+			auto arrow_bind = (PyTableFunctionData *)bind_data.get();
+			arrow_bind->external_dependency = move(ref.external_dependency);
+		}
 	}
 	if (return_types.size() != return_names.size()) {
 		throw InternalException(
@@ -174092,7 +174096,9 @@ void Planner::CreatePlan(SQLStatement &statement) {
 			value_map[expr->parameter_nr] = vector<unique_ptr<Value>>();
 		} else if (entry->second.back()->type() != value->type()) {
 			// used before, but types are inconsistent
-			throw BinderException("Inconsistent types found for parameter with index %llu", expr->parameter_nr);
+			throw BinderException(
+			    "Inconsistent types found for parameter with index %llu, current type %s, new type %s",
+			    expr->parameter_nr, entry->second.back()->type().ToString(), value->type().ToString());
 		}
 		value_map[expr->parameter_nr].push_back(move(value));
 	}

package/src/duckdb.hpp

@@ -11,8 +11,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 #pragma once
 #define DUCKDB_AMALGAMATION 1
 #define DUCKDB_AMALGAMATION_EXTENDED 1
-#define DUCKDB_SOURCE_ID "687b4c85d"
-#define DUCKDB_VERSION "v0.4.1-dev152"
+#define DUCKDB_SOURCE_ID "cee035630"
+#define DUCKDB_VERSION "v0.4.1-dev169"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -5453,7 +5453,6 @@ private:
 
 
 
-
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -5659,6 +5658,29 @@ using named_parameter_map_t = case_insensitive_map_t<Value>;
 } // namespace duckdb
 
 
+
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/main/external_dependencies.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+namespace duckdb {
+
+enum ExternalDependenciesType { PYTHON_DEPENDENCY };
+class ExternalDependency {
+public:
+	explicit ExternalDependency(ExternalDependenciesType type_p) : type(type_p) {};
+	virtual ~ExternalDependency() {};
+	ExternalDependenciesType type;
+};
+
+} // namespace duckdb
+
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -6362,6 +6384,11 @@ struct TableFunctionData : public FunctionData {
 	DUCKDB_API bool Equals(const FunctionData &other) const override;
 };
 
+struct PyTableFunctionData : public TableFunctionData {
+	//! External dependencies of this table function
+	unique_ptr<ExternalDependency> external_dependency;
+};
+
 struct FunctionParameters {
 	vector<Value> values;
 	named_parameter_map_t named_parameters;
@@ -17701,27 +17728,6 @@ public:
 
 } // namespace duckdb
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/main/external_dependencies.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-namespace duckdb {
-
-enum ExternalDependenciesType { PYTHON_DEPENDENCY };
-class ExternalDependency {
-public:
-	explicit ExternalDependency(ExternalDependenciesType type_p) : type(type_p) {};
-	virtual ~ExternalDependency() {};
-	ExternalDependenciesType type;
-};
-
-} // namespace duckdb
 
 
 namespace duckdb {
@@ -24562,6 +24568,7 @@ public:
 
 
 
+
 namespace duckdb {
 //! Represents a Table producing function
 class TableFunctionRef : public TableRef {
@@ -24574,6 +24581,9 @@ public:
 	// if the function takes a subquery as argument its in here
 	unique_ptr<SelectStatement> subquery;
 
+	// External dependencies of this table funcion
+	unique_ptr<ExternalDependency> external_dependency;
+
 public:
 	string ToString() const override;