duckdb 0.3.3-dev1217.0 → 0.3.3-dev1226.0

package/package.json

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

package/src/duckdb.cpp

@@ -104250,6 +104250,10 @@ duckdb_logical_type duckdb_create_logical_type(duckdb_type type) {
 	return new duckdb::LogicalType(duckdb::ConvertCTypeToCPP(type));
 }
 
+duckdb_logical_type duckdb_create_decimal_type(uint8_t width, uint8_t scale) {
+	return new duckdb::LogicalType(duckdb::LogicalType::DECIMAL(width, scale));
+}
+
 duckdb_type duckdb_get_type_id(duckdb_logical_type type) {
 	if (!type) {
 		return DUCKDB_TYPE_INVALID;
@@ -105222,12 +105226,15 @@ struct CTableInitData : public FunctionOperatorData {
 };
 
 struct CTableInternalInitInfo {
-	CTableInternalInitInfo(CTableBindData &bind_data, CTableInitData &init_data)
-	    : bind_data(bind_data), init_data(init_data), success(true) {
+	CTableInternalInitInfo(CTableBindData &bind_data, CTableInitData &init_data, const vector<column_t> &column_ids,
+	                       TableFilterCollection *filters)
+	    : bind_data(bind_data), init_data(init_data), column_ids(column_ids), filters(filters), success(true) {
 	}
 
 	CTableBindData &bind_data;
 	CTableInitData &init_data;
+	const vector<column_t> &column_ids;
+	TableFilterCollection *filters;
 	bool success;
 	string error;
 };
@@ -105264,7 +105271,7 @@ unique_ptr<FunctionOperatorData> CTableFunctionInit(ClientContext &context, cons
 	auto &bind_data = (CTableBindData &)*bind_data_p;
 	auto result = make_unique<CTableInitData>();
 
-	CTableInternalInitInfo init_info(bind_data, *result);
+	CTableInternalInitInfo init_info(bind_data, *result, column_ids, filters);
 	bind_data.info->init(&init_info);
 	if (!init_info.success) {
 		throw Exception(init_info.error);
@@ -105358,6 +105365,14 @@ void duckdb_table_function_set_function(duckdb_table_function table_function, du
 	info->function = function;
 }
 
+void duckdb_table_function_supports_projection_pushdown(duckdb_table_function table_function, bool pushdown) {
+	if (!table_function) {
+		return;
+	}
+	auto tf = (duckdb::TableFunction *)table_function;
+	tf->projection_pushdown = pushdown;
+}
+
 duckdb_state duckdb_register_table_function(duckdb_connection connection, duckdb_table_function function) {
 	if (!connection || !function) {
 		return DuckDBError;
@@ -105469,6 +105484,25 @@ void duckdb_init_set_error(duckdb_init_info info, const char *error) {
 	function_info->success = false;
 }
 
+idx_t duckdb_init_get_column_count(duckdb_init_info info) {
+	if (!info) {
+		return 0;
+	}
+	auto function_info = (duckdb::CTableInternalInitInfo *)info;
+	return function_info->column_ids.size();
+}
+
+idx_t duckdb_init_get_column_index(duckdb_init_info info, idx_t column_index) {
+	if (!info) {
+		return 0;
+	}
+	auto function_info = (duckdb::CTableInternalInitInfo *)info;
+	if (column_index >= function_info->column_ids.size()) {
+		return 0;
+	}
+	return function_info->column_ids[column_index];
+}
+
 //===--------------------------------------------------------------------===//
 // Function Interface
 //===--------------------------------------------------------------------===//

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 "3919a8589"
-#define DUCKDB_VERSION "v0.3.3-dev1217"
+#define DUCKDB_SOURCE_ID "39cfae40b"
+#define DUCKDB_VERSION "v0.3.3-dev1226"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -15887,10 +15887,20 @@ The resulting type should be destroyed with `duckdb_destroy_logical_type`.
 This should not be used with `DUCKDB_TYPE_DECIMAL`.
 
 * type: The primitive type to create.
-* returns: The logical type type.
+* returns: The logical type.
 */
 DUCKDB_API duckdb_logical_type duckdb_create_logical_type(duckdb_type type);
 
+/*!
+Creates a `duckdb_logical_type` of type decimal with the specified width and scale
+The resulting type should be destroyed with `duckdb_destroy_logical_type`.
+
+* width: The width of the decimal type
+* scale: The scale of the decimal type
+* returns: The logical type.
+*/
+DUCKDB_API duckdb_logical_type duckdb_create_decimal_type(uint8_t width, uint8_t scale);
+
 /*!
 Retrieves the type class of a `duckdb_logical_type`.
 
@@ -16287,6 +16297,18 @@ Sets the main function of the table function
 DUCKDB_API void duckdb_table_function_set_function(duckdb_table_function table_function,
                                                    duckdb_table_function_t function);
 
+/*!
+Sets whether or not the given table function supports projection pushdown.
+
+If this is set to true, the system will provide a list of all required columns in the `init` stage through
+the `duckdb_init_get_column_count` and `duckdb_init_get_column_index` functions.
+If this is set to false (the default), the system will expect all columns to be projected.
+
+* table_function: The table function
+* pushdown: True if the table function supports projection pushdown, false otherwise.
+*/
+DUCKDB_API void duckdb_table_function_supports_projection_pushdown(duckdb_table_function table_function, bool pushdown);
+
 /*!
 Register the table function object within the given connection.
 
@@ -16388,6 +16410,27 @@ Sets the user-provided init data in the init object. This object can be retrieve
 */
 DUCKDB_API void duckdb_init_set_init_data(duckdb_init_info info, void *init_data, duckdb_delete_callback_t destroy);
 
+/*!
+Returns the number of projected columns.
+
+This function must be used if projection pushdown is enabled to figure out which columns to emit.
+
+* info: The info object
+* returns: The number of projected columns.
+*/
+DUCKDB_API idx_t duckdb_init_get_column_count(duckdb_init_info info);
+
+/*!
+Returns the column index of the projected column at the specified position.
+
+This function must be used if projection pushdown is enabled to figure out which columns to emit.
+
+* info: The info object
+* column_index: The index at which to get the projected column index, from 0..duckdb_init_get_column_count(info)
+* returns: The column index of the projected column.
+*/
+DUCKDB_API idx_t duckdb_init_get_column_index(duckdb_init_info info, idx_t column_index);
+
 /*!
 Report that an error has occurred while calling init.