duckdb 0.2.10-dev358.0 → 0.2.10-dev437.0

package/package.json

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

package/src/duckdb.cpp

@@ -35991,7 +35991,7 @@ int64_t Interval::GetNanoseconds(interval_t val) {
 
 	return nano;
 }
-interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2) {
+interval_t Interval::GetAge(timestamp_t timestamp_1, timestamp_t timestamp_2) {
 	date_t date1, date2;
 	dtime_t time1, time2;
 
@@ -36079,6 +36079,18 @@ interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestam
 
 	return interval;
 }
+interval_t Interval::GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2) {
+	const auto us_1 = Timestamp::GetEpochMicroSeconds(timestamp_1);
+	const auto us_2 = Timestamp::GetEpochMicroSeconds(timestamp_2);
+	const auto delta_us = us_1 - us_2;
+
+	interval_t result;
+	result.months = 0;
+	result.days = delta_us / Interval::MICROS_PER_DAY;
+	result.micros = delta_us % Interval::MICROS_PER_DAY;
+
+	return result;
+}
 
 static void NormalizeIntervalEntries(interval_t input, int64_t &months, int64_t &days, int64_t &micros) {
 	int64_t extra_months_d = input.days / Interval::DAYS_PER_MONTH;
@@ -64741,6 +64753,19 @@ void CheckForPerfectJoinOpt(LogicalComparisonJoin &op, PerfectHashJoinStats &joi
 	return;
 }
 
+static void CanUseIndexJoin(TableScanBindData *tbl, Expression &expr, Index **result_index) {
+	tbl->table->storage->info->indexes.Scan([&](Index &index) {
+		if (index.unbound_expressions.size() != 1) {
+			return false;
+		}
+		if (expr.alias == index.unbound_expressions[0]->alias) {
+			*result_index = &index;
+			return true;
+		}
+		return false;
+	});
+}
+
 void TransformIndexJoin(ClientContext &context, LogicalComparisonJoin &op, Index **left_index, Index **right_index,
                         PhysicalOperator *left, PhysicalOperator *right) {
 	auto &transaction = Transaction::GetTransaction(context);
@@ -64752,26 +64777,14 @@ void TransformIndexJoin(ClientContext &context, LogicalComparisonJoin &op, Index
 			auto &tbl_scan = (PhysicalTableScan &)*left;
 			auto tbl = dynamic_cast<TableScanBindData *>(tbl_scan.bind_data.get());
 			if (CanPlanIndexJoin(transaction, tbl, tbl_scan)) {
-				tbl->table->storage->info->indexes.Scan([&](Index &index) {
-					if (index.unbound_expressions[0]->alias == op.conditions[0].left->alias) {
-						*left_index = &index;
-						return true;
-					}
-					return false;
-				});
+				CanUseIndexJoin(tbl, *op.conditions[0].left, left_index);
 			}
 		}
 		if (right->type == PhysicalOperatorType::TABLE_SCAN) {
 			auto &tbl_scan = (PhysicalTableScan &)*right;
 			auto tbl = dynamic_cast<TableScanBindData *>(tbl_scan.bind_data.get());
 			if (CanPlanIndexJoin(transaction, tbl, tbl_scan)) {
-				tbl->table->storage->info->indexes.Scan([&](Index &index) {
-					if (index.unbound_expressions[0]->alias == op.conditions[0].right->alias) {
-						*right_index = &index;
-						return true;
-					}
-					return false;
-				});
+				CanUseIndexJoin(tbl, *op.conditions[0].right, right_index);
 			}
 		}
 	}
@@ -76581,7 +76594,7 @@ static void AgeFunctionStandard(DataChunk &input, ExpressionState &state, Vector
 	auto current_timestamp = Timestamp::GetCurrentTimestamp();
 
 	UnaryExecutor::Execute<timestamp_t, interval_t>(input.data[0], result, input.size(), [&](timestamp_t input) {
-		return Interval::GetDifference(current_timestamp, input);
+		return Interval::GetAge(current_timestamp, input);
 	});
 }
 
@@ -76590,7 +76603,7 @@ static void AgeFunction(DataChunk &input, ExpressionState &state, Vector &result
 
 	BinaryExecutor::Execute<timestamp_t, timestamp_t, interval_t>(
 	    input.data[0], input.data[1], result, input.size(),
-	    [&](timestamp_t input1, timestamp_t input2) { return Interval::GetDifference(input1, input2); });
+	    [&](timestamp_t input1, timestamp_t input2) { return Interval::GetAge(input1, input2); });
 }
 
 void AgeFun::RegisterFunction(BuiltinFunctions &set) {
@@ -77960,7 +77973,7 @@ struct DateSub {
 			// Our interval difference will now give the correct result.
 			// Note that PG gives different interval subtraction results,
 			// so if we change this we will have to reimplement.
-			return Interval::GetDifference(end_ts, start_ts).months;
+			return Interval::GetAge(end_ts, start_ts).months;
 		}
 	};
 
@@ -129694,8 +129707,7 @@ SetScope ToSetScope(duckdb_libpgquery::VariableSetScope pg_scope) {
 	case duckdb_libpgquery::VariableSetScope::VAR_SET_SCOPE_GLOBAL:
 		return SetScope::GLOBAL;
 	case duckdb_libpgquery::VariableSetScope::VAR_SET_SCOPE_DEFAULT:
-		// FIXME: This should be SESSION. See https://github.com/duckdb/duckdb/pull/2247
-		return SetScope::GLOBAL;
+		return SetScope::SESSION;
 	default:
 		throw InternalException("Unexpected pg_scope: %d", pg_scope);
 	}

package/src/duckdb.hpp

@@ -10,8 +10,8 @@ THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLI
 
 #pragma once
 #define DUCKDB_AMALGAMATION 1
-#define DUCKDB_SOURCE_ID "e9729b082"
-#define DUCKDB_VERSION "0.2.10-dev358"
+#define DUCKDB_SOURCE_ID "ca1fe636e"
+#define DUCKDB_VERSION "0.2.10-dev437"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -5964,7 +5964,10 @@ public:
 	//! Get Interval in Nanoseconds
 	static int64_t GetNanoseconds(interval_t val);
 
-	//! Returns the difference between two timestamps
+	//! Returns the age between two timestamps (including 30 day months)
+	static interval_t GetAge(timestamp_t timestamp_1, timestamp_t timestamp_2);
+
+	//! Returns the exact difference between two timestamps (days and seconds)
 	static interval_t GetDifference(timestamp_t timestamp_1, timestamp_t timestamp_2);
 
 	//! Comparison operators