duckdb 0.6.2-dev2405.0 → 0.6.2-dev2420.0

package/package.json

@@ -2,7 +2,7 @@
   "name": "duckdb",
   "main": "./lib/duckdb.js",
   "types": "./lib/duckdb.d.ts",
-  "version": "0.6.2-dev2405.0",
+  "version": "0.6.2-dev2420.0",
   "description": "DuckDB node.js API",
   "gypfile": true,
   "dependencies": {

package/src/duckdb/src/function/table/version/pragma_version.cpp

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev2405"
+#define DUCKDB_VERSION "0.6.2-dev2420"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "2eb46acc6e"
+#define DUCKDB_SOURCE_ID "b3259573b1"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/planner/binder/expression/bind_function_expression.cpp

@@ -26,7 +26,23 @@ BindResult ExpressionBinder::BindExpression(FunctionExpression &function, idx_t
 		return BindUnnest(function, depth);
 	}
 	auto func = Catalog::GetEntry(context, CatalogType::SCALAR_FUNCTION_ENTRY, function.catalog, function.schema,
-	                              function.function_name, false, error_context);
+	                              function.function_name, true, error_context);
+	if (!func) {
+		// function was not found - check if we this is a table function
+		auto table_func = Catalog::GetEntry(context, CatalogType::TABLE_FUNCTION_ENTRY, function.catalog,
+		                                    function.schema, function.function_name, true, error_context);
+		if (table_func) {
+			throw BinderException(binder.FormatError(
+			    function,
+			    StringUtil::Format("Function \"%s\" is a table function but it was used as a scalar function. This "
+			                       "function has to be called in a FROM clause (similar to a table).",
+			                       function.function_name)));
+		}
+		// not a table function - search again without if_exists to throw the error
+		Catalog::GetEntry(context, CatalogType::SCALAR_FUNCTION_ENTRY, function.catalog, function.schema,
+		                  function.function_name, false, error_context);
+		throw InternalException("Catalog::GetEntry for scalar function did not throw a second time");
+	}
 
 	if (func->type != CatalogType::AGGREGATE_FUNCTION_ENTRY &&
 	    (function.distinct || function.filter || !function.order_bys->orders.empty())) {

package/src/duckdb/src/storage/single_file_block_manager.cpp

@@ -31,11 +31,11 @@ void MainHeader::Serialize(Serializer &ser) {
 void MainHeader::CheckMagicBytes(FileHandle &handle) {
 	data_t magic_bytes[MAGIC_BYTE_SIZE];
 	if (handle.GetFileSize() < MainHeader::MAGIC_BYTE_SIZE + MainHeader::MAGIC_BYTE_OFFSET) {
-		throw IOException("The file is not a valid DuckDB database file!");
+		throw IOException("The file \"%s\" exists, but it is not a valid DuckDB database file!", handle.path);
 	}
 	handle.Read(magic_bytes, MainHeader::MAGIC_BYTE_SIZE, MainHeader::MAGIC_BYTE_OFFSET);
 	if (memcmp(magic_bytes, MainHeader::MAGIC_BYTES, MainHeader::MAGIC_BYTE_SIZE) != 0) {
-		throw IOException("The file is not a valid DuckDB database file!");
+		throw IOException("The file \"%s\" exists, but it is not a valid DuckDB database file!", handle.path);
 	}
 }