duckdb 0.4.1-dev75.0 → 0.4.1-dev85.0

package/package.json

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

package/src/duckdb.cpp

@@ -17291,12 +17291,12 @@ public:
 
 #include <cstdint>
 #include <cstdio>
+#include <sys/stat.h>
 
 #ifndef _WIN32
 #include <dirent.h>
 #include <fcntl.h>
 #include <string.h>
-#include <sys/stat.h>
 #include <sys/types.h>
 #include <unistd.h>
 #else
@@ -17335,7 +17335,6 @@ public:
 #include <string>
 
 #ifdef __MINGW32__
-#include <sys/stat.h>
 // need to manually define this for mingw
 extern "C" WINBASEAPI BOOL WINAPI GetPhysicallyInstalledSystemMemory(PULONGLONG);
 #endif
@@ -17360,33 +17359,6 @@ static void AssertValidFileFlags(uint8_t flags) {
 #endif
 }
 
-#ifdef __MINGW32__
-bool LocalFileSystem::FileExists(const string &filename) {
-	auto unicode_path = WindowsUtil::UTF8ToUnicode(filename.c_str());
-	const wchar_t *wpath = unicode_path.c_str();
-	if (_waccess(wpath, 0) == 0) {
-		struct _stat64i32 status;
-		_wstat64i32(wpath, &status);
-		if (status.st_size > 0) {
-			return true;
-		}
-	}
-	return false;
-}
-bool LocalFileSystem::IsPipe(const string &filename) {
-	auto unicode_path = WindowsUtil::UTF8ToUnicode(filename.c_str());
-	const wchar_t *wpath = unicode_path.c_str();
-	if (_waccess(wpath, 0) == 0) {
-		struct _stat64i32 status;
-		_wstat64i32(wpath, &status);
-		if (status.st_size == 0) {
-			return true;
-		}
-	}
-	return false;
-}
-
-#else
 #ifndef _WIN32
 bool LocalFileSystem::FileExists(const string &filename) {
 	if (!filename.empty()) {
@@ -17421,8 +17393,8 @@ bool LocalFileSystem::FileExists(const string &filename) {
 	auto unicode_path = WindowsUtil::UTF8ToUnicode(filename.c_str());
 	const wchar_t *wpath = unicode_path.c_str();
 	if (_waccess(wpath, 0) == 0) {
-		struct _stat64i32 status;
-		_wstat(wpath, &status);
+		struct _stati64 status;
+		_wstati64(wpath, &status);
 		if (status.st_mode & S_IFREG) {
 			return true;
 		}
@@ -17433,8 +17405,8 @@ bool LocalFileSystem::IsPipe(const string &filename) {
 	auto unicode_path = WindowsUtil::UTF8ToUnicode(filename.c_str());
 	const wchar_t *wpath = unicode_path.c_str();
 	if (_waccess(wpath, 0) == 0) {
-		struct _stat64i32 status;
-		_wstat(wpath, &status);
+		struct _stati64 status;
+		_wstati64(wpath, &status);
 		if (status.st_mode & _S_IFCHR) {
 			return true;
 		}
@@ -17442,7 +17414,6 @@ bool LocalFileSystem::IsPipe(const string &filename) {
 	return false;
 }
 #endif
-#endif
 
 #ifndef _WIN32
 // somehow sometimes this is missing
@@ -47744,7 +47715,7 @@ PhysicalType LogicalType::GetInternalType() {
 		} else if (width <= Decimal::MAX_WIDTH_INT128) {
 			return PhysicalType::INT128;
 		} else {
-			throw InternalException("Widths bigger than 38 are not supported");
+			throw InternalException("Widths bigger than %d are not supported", DecimalType::MaxWidth());
 		}
 	}
 	case LogicalTypeId::VARCHAR:
@@ -48294,9 +48265,20 @@ LogicalType LogicalType::MaxLogicalType(const LogicalType &left, const LogicalTy
 				return right;
 			}
 		} else if (type_id == LogicalTypeId::DECIMAL) {
-			// use max width/scale of the two types
-			auto width = MaxValue<uint8_t>(DecimalType::GetWidth(left), DecimalType::GetWidth(right));
+			// unify the width/scale so that the resulting decimal always fits
+			// "width - scale" gives us the number of digits on the left side of the decimal point
+			// "scale" gives us the number of digits allowed on the right of the deciaml point
+			// using the max of these of the two types gives us the new decimal size
+			auto extra_width_left = DecimalType::GetWidth(left) - DecimalType::GetScale(left);
+			auto extra_width_right = DecimalType::GetWidth(right) - DecimalType::GetScale(right);
+			auto extra_width = MaxValue<uint8_t>(extra_width_left, extra_width_right);
 			auto scale = MaxValue<uint8_t>(DecimalType::GetScale(left), DecimalType::GetScale(right));
+			auto width = extra_width + scale;
+			if (width > DecimalType::MaxWidth()) {
+				// if the resulting decimal does not fit, we truncate the scale
+				width = DecimalType::MaxWidth();
+				scale = width - extra_width;
+			}
 			return LogicalType::DECIMAL(width, scale);
 		} else if (type_id == LogicalTypeId::LIST) {
 			// list: perform max recursively on child type
@@ -48493,6 +48475,10 @@ uint8_t DecimalType::GetScale(const LogicalType &type) {
 	return ((DecimalTypeInfo &)*info).scale;
 }
 
+uint8_t DecimalType::MaxWidth() {
+	return 38;
+}
+
 LogicalType LogicalType::DECIMAL(int width, int scale) {
 	auto type_info = make_shared<DecimalTypeInfo>(width, scale);
 	return LogicalType(LogicalTypeId::DECIMAL, move(type_info));

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 "26d123fdc"
-#define DUCKDB_VERSION "v0.4.1-dev75"
+#define DUCKDB_SOURCE_ID "4565d24b7"
+#define DUCKDB_VERSION "v0.4.1-dev85"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //
@@ -1124,6 +1124,7 @@ public:
 struct DecimalType {
 	DUCKDB_API static uint8_t GetWidth(const LogicalType &type);
 	DUCKDB_API static uint8_t GetScale(const LogicalType &type);
+	DUCKDB_API static uint8_t MaxWidth();
 };
 
 struct StringType {