duckdb 0.3.3-dev105.0 → 0.3.3-dev108.0

package/package.json

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

package/src/duckdb.cpp

@@ -15826,6 +15826,10 @@ public:
 		return "LocalFileSystem";
 	}
 
+	//! Returns the last Win32 error, in string format. Returns an empty string if there is no error, or on non-Windows
+	//! systems.
+	static std::string GetLastErrorAsString();
+
 private:
 	//! Set the file pointer of a file handle to a specified location. Reads and writes will happen from this location
 	void SetFilePointer(FileHandle &handle, idx_t location);
@@ -16273,12 +16277,16 @@ void LocalFileSystem::MoveFile(const string &source, const string &target) {
 	}
 }
 
+std::string LocalFileSystem::GetLastErrorAsString() {
+	return string();
+}
+
 #else
 
 constexpr char PIPE_PREFIX[] = "\\\\.\\pipe\\";
 
 // Returns the last Win32 error, in string format. Returns an empty string if there is no error.
-std::string GetLastErrorAsString() {
+std::string LocalFileSystem::GetLastErrorAsString() {
 	// Get the error message, if any.
 	DWORD errorMessageID = GetLastError();
 	if (errorMessageID == 0)
@@ -16354,7 +16362,7 @@ unique_ptr<FileHandle> LocalFileSystem::OpenFile(const string &path, uint8_t fla
 	HANDLE hFile = CreateFileW(unicode_path.c_str(), desired_access, share_mode, NULL, creation_disposition,
 	                           flags_and_attributes, NULL);
 	if (hFile == INVALID_HANDLE_VALUE) {
-		auto error = GetLastErrorAsString();
+		auto error = LocalFileSystem::GetLastErrorAsString();
 		throw IOException("Cannot open file \"%s\": %s", path.c_str(), error);
 	}
 	auto handle = make_unique<WindowsFileHandle>(*this, path.c_str(), hFile);
@@ -16383,7 +16391,7 @@ static DWORD FSInternalRead(FileHandle &handle, HANDLE hFile, void *buffer, int6
 	ov.hEvent = 0;
 	auto rc = ReadFile(hFile, buffer, (DWORD)nr_bytes, &bytes_read, &ov);
 	if (!rc) {
-		auto error = GetLastErrorAsString();
+		auto error = LocalFileSystem::GetLastErrorAsString();
 		throw IOException("Could not read file \"%s\" (error in ReadFile): %s", handle.path, error);
 	}
 	return bytes_read;
@@ -16417,7 +16425,7 @@ static DWORD FSInternalWrite(FileHandle &handle, HANDLE hFile, void *buffer, int
 	ov.hEvent = 0;
 	auto rc = WriteFile(hFile, buffer, (DWORD)nr_bytes, &bytes_written, &ov);
 	if (!rc) {
-		auto error = GetLastErrorAsString();
+		auto error = LocalFileSystem::GetLastErrorAsString();
 		throw IOException("Could not write file \"%s\" (error in WriteFile): %s", handle.path, error);
 	}
 	return bytes_written;
@@ -16481,7 +16489,7 @@ void LocalFileSystem::Truncate(FileHandle &handle, int64_t new_size) {
 	SetFilePointer(handle, new_size);
 	// now set the end of file position
 	if (!SetEndOfFile(hFile)) {
-		auto error = GetLastErrorAsString();
+		auto error = LocalFileSystem::GetLastErrorAsString();
 		throw IOException("Failure in SetEndOfFile call on file \"%s\": %s", handle.path, error);
 	}
 }
@@ -109432,6 +109440,7 @@ void ExtensionHelper::InstallExtension(DatabaseInstance &db, const string &exten
 
 
 
+
 #ifndef _WIN32
 #include <dlfcn.h>
 #else
@@ -109452,6 +109461,17 @@ void *dlsym(void *handle, const char *name) {
 	D_ASSERT(handle);
 	return (void *)GetProcAddress((HINSTANCE)handle, name);
 }
+
+std::string GetDLError(void) {
+	return LocalFileSystem::GetLastErrorAsString();
+}
+
+#else
+
+std::string GetDLError(void) {
+	return dlerror();
+}
+
 #endif
 
 } // namespace duckdb
@@ -109469,7 +109489,7 @@ template <class T>
 static T LoadFunctionFromDLL(void *dll, const string &function_name, const string &filename) {
 	auto function = dlsym(dll, function_name.c_str());
 	if (!function) {
-		throw IOException("File \"%s\" did not contain function \"%s\"", filename, function_name);
+		throw IOException("File \"%s\" did not contain function \"%s\": %s", filename, function_name, GetDLError());
 	}
 	return (T)function;
 }
@@ -109497,7 +109517,7 @@ void ExtensionHelper::LoadExternalExtension(DatabaseInstance &db, const string &
 	}
 	auto lib_hdl = dlopen(filename.c_str(), RTLD_LAZY | RTLD_LOCAL);
 	if (!lib_hdl) {
-		throw IOException("File \"%s\" could not be loaded", filename);
+		throw IOException("File \"%s\" could not be loaded: %s", filename, GetDLError());
 	}
 
 	auto basename = fs.ExtractBaseName(filename);

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 "e25230541"
-#define DUCKDB_VERSION "v0.3.3-dev105"
+#define DUCKDB_SOURCE_ID "6eb39f78f"
+#define DUCKDB_VERSION "v0.3.3-dev108"
 //===----------------------------------------------------------------------===//
 //                         DuckDB
 //