duckdb 0.7.2-dev3353.0 → 0.7.2-dev3402.0

package/package.json

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

package/src/duckdb/extension/json/buffered_json_reader.cpp

@@ -162,9 +162,8 @@ BufferedJSONReader::BufferedJSONReader(ClientContext &context, BufferedJSONReade
 void BufferedJSONReader::OpenJSONFile() {
 	lock_guard<mutex> guard(lock);
 	auto &file_system = FileSystem::GetFileSystem(context);
-	auto file_opener = FileOpener::Get(context);
-	auto regular_file_handle = file_system.OpenFile(file_path.c_str(), FileFlags::FILE_FLAGS_READ,
-	                                                FileLockType::NO_LOCK, options.compression, file_opener);
+	auto regular_file_handle =
+	    file_system.OpenFile(file_path.c_str(), FileFlags::FILE_FLAGS_READ, FileLockType::NO_LOCK, options.compression);
 	file_handle = make_uniq<JSONFileHandle>(std::move(regular_file_handle), BufferAllocator::Get(context));
 }
 

package/src/duckdb/extension/json/include/json_functions.hpp

@@ -17,6 +17,7 @@ class TableRef;
 struct ReplacementScanData;
 class CastFunctionSet;
 struct CastParameters;
+struct CastLocalStateParameters;
 struct JSONScanInfo;
 class BuiltinFunctions;
 
@@ -56,6 +57,7 @@ public:
 	explicit JSONFunctionLocalState(ClientContext &context);
 	static unique_ptr<FunctionLocalState> Init(ExpressionState &state, const BoundFunctionExpression &expr,
 	                                           FunctionData *bind_data);
+	static unique_ptr<FunctionLocalState> InitCastLocalState(CastLocalStateParameters &parameters);
 	static JSONFunctionLocalState &ResetAndGet(ExpressionState &state);
 
 public:
@@ -71,7 +73,9 @@ public:
 	                                                ReplacementScanData *data);
 	static TableFunction GetReadJSONTableFunction(shared_ptr<JSONScanInfo> function_info);
 	static CopyFunction GetJSONCopyFunction();
-	static void RegisterCastFunctions(CastFunctionSet &casts);
+	static void RegisterSimpleCastFunctions(CastFunctionSet &casts);
+	static void RegisterJSONCreateCastFunctions(CastFunctionSet &casts);
+	static void RegisterJSONTransformCastFunctions(CastFunctionSet &casts);
 
 private:
 	// Scalar functions

package/src/duckdb/extension/json/include/json_scan.hpp

@@ -87,6 +87,7 @@ public:
 
 	static unique_ptr<FunctionData> Bind(ClientContext &context, TableFunctionBindInput &input);
 	void InitializeFormats();
+	void InitializeFormats(bool auto_detect);
 
 	void Serialize(FieldWriter &writer);
 	void Deserialize(FieldReader &reader);

package/src/duckdb/extension/json/include/json_transform.hpp

@@ -32,8 +32,8 @@ public:
 	//! Throws an error if an object has a key we didn't know about
 	bool error_unknown_key = false;
 
-	//! JSON reader for adding line number information to transform errors (can be NULL)
-	bool from_file = false;
+	//! Whether to delay the error when transforming (e.g., when non-strict casting or reading from file)
+	bool delay_error = false;
 	//! Date format used for parsing (can be NULL)
 	DateFormatMap *date_format_map = nullptr;
 	//! String to store errors in

package/src/duckdb/extension/json/json-extension.cpp

@@ -3,12 +3,14 @@
 
 #include "duckdb/catalog/catalog_entry/macro_catalog_entry.hpp"
 #include "duckdb/catalog/default/default_functions.hpp"
-#include "duckdb/main/extension_util.hpp"
 #include "duckdb/common/string_util.hpp"
+#include "duckdb/function/copy_function.hpp"
+#include "duckdb/main/extension_util.hpp"
 #include "duckdb/parser/expression/constant_expression.hpp"
 #include "duckdb/parser/expression/function_expression.hpp"
+#include "duckdb/parser/parsed_data/create_pragma_function_info.hpp"
+#include "duckdb/parser/parsed_data/create_type_info.hpp"
 #include "duckdb/parser/tableref/table_function_ref.hpp"
-#include "duckdb/function/copy_function.hpp"
 #include "json_common.hpp"
 #include "json_functions.hpp"
 
@@ -28,7 +30,9 @@ void JSONExtension::Load(DuckDB &db) {
 	ExtensionUtil::RegisterType(db_instance, JSONCommon::JSON_TYPE_NAME, std::move(json_type));
 
 	// JSON casts
-	JSONFunctions::RegisterCastFunctions(DBConfig::GetConfig(db_instance).GetCastFunctions());
+	JSONFunctions::RegisterSimpleCastFunctions(DBConfig::GetConfig(db_instance).GetCastFunctions());
+	JSONFunctions::RegisterJSONCreateCastFunctions(DBConfig::GetConfig(db_instance).GetCastFunctions());
+	JSONFunctions::RegisterJSONTransformCastFunctions(DBConfig::GetConfig(db_instance).GetCastFunctions());
 
 	// JSON scalar functions
 	for (auto &fun : JSONFunctions::GetScalarFunctions()) {

package/src/duckdb/extension/json/json_functions/copy_json.cpp

@@ -98,10 +98,21 @@ static duckdb::unique_ptr<FunctionData> CopyFromJSONBind(ClientContext &context,
 		bind_data->timestamp_format = StringValue::Get(it->second.back());
 	}
 
-	bind_data->InitializeFormats();
-
 	bind_data->transform_options = JSONTransformOptions(true, true, true, true);
-	bind_data->transform_options.from_file = true;
+	bind_data->transform_options.delay_error = true;
+
+	it = info.options.find("auto_detect");
+	if (it != info.options.end()) {
+		// Wrap this with auto detect true/false so we can detect date/timestamp formats
+		// Note that auto_detect for names/types is not actually true because these are already know when we COPY
+		bind_data->InitializeFormats(true);
+		bind_data->options.format = JSONFormat::AUTO_DETECT;
+		bind_data->record_type = JSONRecordType::AUTO;
+		JSONScan::AutoDetect(context, *bind_data, expected_types, expected_names);
+		bind_data->auto_detect = true;
+	} else {
+		bind_data->InitializeFormats();
+	}
 
 	return std::move(bind_data);
 }
@@ -113,8 +124,8 @@ CopyFunction JSONFunctions::GetJSONCopyFunction() {
 	function.plan = CopyToJSONPlan;
 
 	function.copy_from_bind = CopyFromJSONBind;
-	function.copy_from_function = JSONFunctions::GetReadJSONTableFunction(
-	    make_shared<JSONScanInfo>(JSONScanType::READ_JSON, JSONFormat::AUTO_DETECT, JSONRecordType::RECORDS, false));
+	function.copy_from_function = JSONFunctions::GetReadJSONTableFunction(make_shared<JSONScanInfo>(
+	    JSONScanType::READ_JSON, JSONFormat::NEWLINE_DELIMITED, JSONRecordType::RECORDS, false));
 
 	return function;
 }