duckdb 0.3.3-dev1282.0 → 0.3.3-dev1297.0

package/package.json

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

package/src/duckdb.cpp

@@ -46749,9 +46749,7 @@ void AdaptiveFilter::AdaptRuntimeStatistics(double duration) {
 
 
 
-
 #include <cmath>
-#include <map>
 
 namespace duckdb {
 
@@ -47966,7 +47964,6 @@ idx_t ExpressionExecutor::Select(const BoundBetweenExpression &expr, ExpressionS
 
 
 
-
 namespace duckdb {
 
 struct CaseExpressionState : public ExpressionState {
@@ -50968,9 +50965,6 @@ private:
 
 
 
-
-
-
 namespace duckdb {
 
 using ValidityBytes = JoinHashTable::ValidityBytes;
@@ -67004,7 +66998,6 @@ void PartitionableHashTable::Finalize() {
 
 
 
-
 namespace duckdb {
 
 PerfectAggregateHashTable::PerfectAggregateHashTable(BufferManager &buffer_manager,
@@ -71876,8 +71869,6 @@ void BaseReservoirSampling::ReplaceElement() {
 
 
 
-#include <cmath>
-
 namespace duckdb {
 
 WindowSegmentTree::WindowSegmentTree(AggregateFunction &aggregate, FunctionData *bind_info,
@@ -96609,11 +96600,6 @@ void ScalarFunction::NopFunction(DataChunk &input, ExpressionState &state, Vecto
 
 
 
-
-
-
-
-
 namespace duckdb {
 
 ScalarMacroFunction::ScalarMacroFunction(unique_ptr<ParsedExpression> expression)
@@ -96640,8 +96626,6 @@ unique_ptr<MacroFunction> ScalarMacroFunction::Copy() {
 
 
 
-
-
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -96977,9 +96961,14 @@ unique_ptr<FunctionData> ArrowTableFunction::ArrowScanBind(ClientContext &contex
 	    uintptr_t stream_factory_ptr,
 	    std::pair<std::unordered_map<idx_t, string>, std::vector<string>> & project_columns,
 	    TableFilterCollection * filters);
+
+	typedef void (*stream_factory_get_schema_t)(uintptr_t stream_factory_ptr, ArrowSchemaWrapper & schema);
+
 	auto stream_factory_ptr = input.inputs[0].GetPointer();
 	auto stream_factory_produce = (stream_factory_produce_t)input.inputs[1].GetPointer();
-	auto rows_per_thread = input.inputs[2].GetValue<uint64_t>();
+	auto stream_factory_get_schema = (stream_factory_get_schema_t)input.inputs[2].GetPointer();
+	auto rows_per_thread = input.inputs[3].GetValue<uint64_t>();
+
 	std::pair<std::unordered_map<idx_t, string>, std::vector<string>> project_columns;
 #ifndef DUCKDB_NO_THREADS
 
@@ -96989,15 +96978,7 @@ unique_ptr<FunctionData> ArrowTableFunction::ArrowScanBind(ClientContext &contex
 	auto res = make_unique<ArrowScanFunctionData>(rows_per_thread, stream_factory_produce, stream_factory_ptr);
 #endif
 	auto &data = *res;
-	auto stream = stream_factory_produce(stream_factory_ptr, project_columns, nullptr);
-
-	data.number_of_rows = stream->number_of_rows;
-	if (!stream) {
-		throw InvalidInputException("arrow_scan: NULL pointer passed");
-	}
-
-	stream->GetSchema(data.schema_root);
-
+	stream_factory_get_schema(stream_factory_ptr, data.schema_root);
 	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) {
@@ -97907,11 +97888,11 @@ double ArrowTableFunction::ArrowProgress(ClientContext &context, const FunctionD
 
 void ArrowTableFunction::RegisterFunction(BuiltinFunctions &set) {
 	TableFunctionSet arrow("arrow_scan");
-	arrow.AddFunction(TableFunction({LogicalType::POINTER, LogicalType::POINTER, LogicalType::UBIGINT},
-	                                ArrowScanFunction, ArrowScanBind, ArrowScanInit, nullptr, nullptr, nullptr,
-	                                ArrowScanCardinality, nullptr, nullptr, ArrowScanMaxThreads,
-	                                ArrowScanInitParallelState, ArrowScanFunctionParallel, ArrowScanParallelInit,
-	                                ArrowScanParallelStateNext, true, true, ArrowProgress));
+	arrow.AddFunction(
+	    TableFunction({LogicalType::POINTER, LogicalType::POINTER, LogicalType::POINTER, LogicalType::UBIGINT},
+	                  ArrowScanFunction, ArrowScanBind, ArrowScanInit, nullptr, nullptr, nullptr, ArrowScanCardinality,
+	                  nullptr, nullptr, ArrowScanMaxThreads, ArrowScanInitParallelState, ArrowScanFunctionParallel,
+	                  ArrowScanParallelInit, ArrowScanParallelStateNext, true, true, ArrowProgress));
 	set.AddFunction(arrow);
 }
 
@@ -98062,7 +98043,6 @@ struct ReadCSVTableFunction {
 
 
 
-
 #include <limits>
 
 namespace duckdb {
@@ -98772,6 +98752,7 @@ struct TestAllTypesFun {
 
 
 
+
 namespace duckdb {
 
 struct PragmaDetailedProfilingOutputOperatorData : public FunctionOperatorData {
@@ -99320,7 +99301,6 @@ void BuiltinFunctions::RegisterTableFunctions() {
 
 
 
-
 #include <limits>
 
 namespace duckdb {
@@ -103349,8 +103329,6 @@ void UDFWrapper::RegisterAggrFunction(AggregateFunction aggr_function, ClientCon
 
 
 
-
-
 namespace duckdb {
 
 BaseAppender::BaseAppender() : column(0) {
@@ -104817,7 +104795,6 @@ duckdb_logical_type duckdb_struct_type_child_type(duckdb_logical_type type, idx_
 
 
 
-
 using duckdb::Connection;
 using duckdb::date_t;
 using duckdb::dtime_t;
@@ -106556,67 +106533,6 @@ public:
 
 } // namespace duckdb
 
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/parser/statement/execute_statement.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-
-
-
-
-namespace duckdb {
-
-class ExecuteStatement : public SQLStatement {
-public:
-	ExecuteStatement();
-
-	string name;
-	vector<unique_ptr<ParsedExpression>> values;
-
-protected:
-	ExecuteStatement(const ExecuteStatement &other);
-
-public:
-	unique_ptr<SQLStatement> Copy() const override;
-};
-} // namespace duckdb
-
-
-//===----------------------------------------------------------------------===//
-//                         DuckDB
-//
-// duckdb/parser/statement/prepare_statement.hpp
-//
-//
-//===----------------------------------------------------------------------===//
-
-
-
-
-
-
-namespace duckdb {
-
-class PrepareStatement : public SQLStatement {
-public:
-	PrepareStatement();
-
-	unique_ptr<SQLStatement> statement;
-	string name;
-
-protected:
-	PrepareStatement(const PrepareStatement &other);
-
-public:
-	unique_ptr<SQLStatement> Copy() const override;
-};
-} // namespace duckdb
 
 
 
@@ -106780,7 +106696,6 @@ private:
 
 
 
-
 namespace duckdb {
 
 struct ActiveQueryContext {
@@ -117939,7 +117854,6 @@ using std::ofstream;
 
 
 
-
 #include <utility>
 #include <algorithm>
 
@@ -119160,7 +119074,6 @@ public:
 
 
 
-
 namespace duckdb {
 
 CreateTableRelation::CreateTableRelation(shared_ptr<Relation> child_p, string schema_name, string table_name)
@@ -119232,7 +119145,6 @@ public:
 
 
 
-
 namespace duckdb {
 
 CreateViewRelation::CreateViewRelation(shared_ptr<Relation> child_p, string view_name_p, bool replace_p,
@@ -145686,6 +145598,36 @@ unique_ptr<SQLStatement> DropStatement::Copy() const {
 }
 
 } // namespace duckdb
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/statement/execute_statement.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+
+
+
+namespace duckdb {
+
+class ExecuteStatement : public SQLStatement {
+public:
+	ExecuteStatement();
+
+	string name;
+	vector<unique_ptr<ParsedExpression>> values;
+
+protected:
+	ExecuteStatement(const ExecuteStatement &other);
+
+public:
+	unique_ptr<SQLStatement> Copy() const override;
+};
+} // namespace duckdb
 
 
 namespace duckdb {
@@ -145843,6 +145785,35 @@ unique_ptr<SQLStatement> PragmaStatement::Copy() const {
 }
 
 } // namespace duckdb
+//===----------------------------------------------------------------------===//
+//                         DuckDB
+//
+// duckdb/parser/statement/prepare_statement.hpp
+//
+//
+//===----------------------------------------------------------------------===//
+
+
+
+
+
+
+namespace duckdb {
+
+class PrepareStatement : public SQLStatement {
+public:
+	PrepareStatement();
+
+	unique_ptr<SQLStatement> statement;
+	string name;
+
+protected:
+	PrepareStatement(const PrepareStatement &other);
+
+public:
+	unique_ptr<SQLStatement> Copy() const override;
+};
+} // namespace duckdb
 
 
 namespace duckdb {
@@ -153894,6 +153865,9 @@ unique_ptr<BoundResultModifier> Binder::BindLimit(LimitModifier &limit_mod) {
 		result->limit = BindDelimiter(context, move(limit_mod.limit), LogicalType::BIGINT, val);
 		if (!result->limit) {
 			result->limit_val = val.GetValue<int64_t>();
+			if (result->limit_val < 0) {
+				throw BinderException("LIMIT cannot be negative");
+			}
 		}
 	}
 	if (limit_mod.offset) {
@@ -153901,6 +153875,9 @@ unique_ptr<BoundResultModifier> Binder::BindLimit(LimitModifier &limit_mod) {
 		result->offset = BindDelimiter(context, move(limit_mod.offset), LogicalType::BIGINT, val);
 		if (!result->offset) {
 			result->offset_val = val.GetValue<int64_t>();
+			if (result->offset_val < 0) {
+				throw BinderException("OFFSET cannot be negative");
+			}
 		}
 	}
 	return move(result);
@@ -164374,8 +164351,6 @@ void WriteOverflowStringsToDisk::AllocateNewBlock(block_id_t new_block_id) {
 
 
 
-
-
 
 
 
@@ -178158,8 +178133,6 @@ bool ValidityColumnData::CheckZonemap(ColumnScanState &state, TableFilter &filte
 
 
 
-
-
 
 namespace duckdb {
 
@@ -178677,7 +178650,6 @@ void ReplayState::ReplayCheckpoint() {
 
 
 
-
 #include <cstring>
 
 namespace duckdb {

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 "a52157e01"
-#define DUCKDB_VERSION "v0.3.3-dev1282"
+#define DUCKDB_SOURCE_ID "c47bd311e"
+#define DUCKDB_VERSION "v0.3.3-dev1297"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //