duckdb 0.4.1-dev63.0 → 0.4.1-dev68.0

package/package.json

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

package/src/duckdb.cpp

@@ -24177,6 +24177,9 @@ bool TryCast::Operation(timestamp_t input, date_t &result, bool strict) {
 
 template <>
 bool TryCast::Operation(timestamp_t input, dtime_t &result, bool strict) {
+	if (!Timestamp::IsFinite(input)) {
+		return false;
+	}
 	result = Timestamp::GetTime(input);
 	return true;
 }
@@ -25537,9 +25540,9 @@ duckdb::string_t StringCast::Operation(hugeint_t input, Vector &vector) {
 template <>
 duckdb::string_t StringCast::Operation(date_t input, Vector &vector) {
 	if (input == date_t::infinity()) {
-		return "infinity";
+		return StringVector::AddString(vector, Date::PINF);
 	} else if (input == date_t::ninfinity()) {
-		return "-infinity";
+		return StringVector::AddString(vector, Date::NINF);
 	}
 	int32_t date[3];
 	Date::Convert(input, date[0], date[1], date[2]);
@@ -25577,9 +25580,9 @@ duckdb::string_t StringCast::Operation(dtime_t input, Vector &vector) {
 template <>
 duckdb::string_t StringCast::Operation(timestamp_t input, Vector &vector) {
 	if (input == timestamp_t::infinity()) {
-		return string_t("infinity");
+		return StringVector::AddString(vector, Date::PINF);
 	} else if (input == timestamp_t::ninfinity()) {
-		return string_t("-infinity");
+		return StringVector::AddString(vector, Date::NINF);
 	}
 	date_t date_entry;
 	dtime_t time_entry;
@@ -25639,6 +25642,11 @@ string_t StringCastTZ::Operation(dtime_t input, Vector &vector) {
 
 template <>
 string_t StringCastTZ::Operation(timestamp_t input, Vector &vector) {
+	if (input == timestamp_t::infinity()) {
+		return StringVector::AddString(vector, Date::PINF);
+	} else if (input == timestamp_t::ninfinity()) {
+		return StringVector::AddString(vector, Date::NINF);
+	}
 	date_t date_entry;
 	dtime_t time_entry;
 	Timestamp::Convert(input, date_entry, time_entry);
@@ -40109,6 +40117,10 @@ namespace duckdb {
 
 static_assert(sizeof(date_t) == sizeof(int32_t), "date_t was padded");
 
+const char *Date::PINF = "infinity";  // NOLINT
+const char *Date::NINF = "-infinity"; // NOLINT
+const char *Date::EPOCH = "epoch";    // NOLINT
+
 const string_t Date::MONTH_NAMES_ABBREVIATED[] = {"Jan", "Feb", "Mar", "Apr", "May", "Jun",
                                                   "Jul", "Aug", "Sep", "Oct", "Nov", "Dec"};
 const string_t Date::MONTH_NAMES[] = {"January", "February", "March",     "April",   "May",      "June",
@@ -40320,9 +40332,9 @@ bool Date::TryConvertDate(const char *buf, idx_t len, idx_t &pos, date_t &result
 	}
 	if (!StringUtil::CharacterIsDigit(buf[pos])) {
 		// Check for special values
-		if (TryConvertDateSpecial(buf, len, pos, "infinity")) {
+		if (TryConvertDateSpecial(buf, len, pos, PINF)) {
 			result = yearneg ? date_t::ninfinity() : date_t::infinity();
-		} else if (TryConvertDateSpecial(buf, len, pos, "epoch")) {
+		} else if (TryConvertDateSpecial(buf, len, pos, EPOCH)) {
 			result = date_t::epoch();
 		} else {
 			return false;
@@ -40435,9 +40447,9 @@ string Date::ToString(date_t date) {
 	// PG displays temporal infinities in lowercase,
 	// but numerics in Titlecase.
 	if (date == date_t::infinity()) {
-		return "infinity";
+		return PINF;
 	} else if (date == date_t::ninfinity()) {
-		return "-infinity";
+		return NINF;
 	}
 	int32_t date_units[3];
 	idx_t year_length;
@@ -43502,9 +43514,9 @@ timestamp_t Timestamp::FromString(const string &str) {
 
 string Timestamp::ToString(timestamp_t timestamp) {
 	if (timestamp == timestamp_t::infinity()) {
-		return "infinity";
+		return Date::PINF;
 	} else if (timestamp == timestamp_t::ninfinity()) {
-		return "-infinity";
+		return Date::NINF;
 	}
 	date_t date;
 	dtime_t time;
@@ -43522,6 +43534,9 @@ date_t Timestamp::GetDate(timestamp_t timestamp) {
 }
 
 dtime_t Timestamp::GetTime(timestamp_t timestamp) {
+	if (!IsFinite(timestamp)) {
+		throw ConversionException("Can't get TIME of infinite TIMESTAMP");
+	}
 	date_t date = Timestamp::GetDate(timestamp);
 	return dtime_t(timestamp.value - (int64_t(date.days) * int64_t(Interval::MICROS_PER_DAY)));
 }

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 "382f97e45"
-#define DUCKDB_VERSION "v0.4.1-dev63"
+#define DUCKDB_SOURCE_ID "995622ad3"
+#define DUCKDB_VERSION "v0.4.1-dev68"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -18876,6 +18876,10 @@ namespace duckdb {
 //! The Date class is a static class that holds helper functions for the Date type.
 class Date {
 public:
+	static const char *PINF;  // NOLINT
+	static const char *NINF;  // NOLINT
+	static const char *EPOCH; // NOLINT
+
 	static const string_t MONTH_NAMES[12];
 	static const string_t MONTH_NAMES_ABBREVIATED[12];
 	static const string_t DAY_NAMES[7];