duckdb 0.6.2-dev1223.0 → 0.6.2-dev1226.0

package/package.json

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

package/src/duckdb/src/execution/physical_plan/plan_copy_to_file.cpp

@@ -9,15 +9,14 @@ unique_ptr<PhysicalOperator> PhysicalPlanGenerator::CreatePlan(LogicalCopyToFile
 	auto &fs = FileSystem::GetFileSystem(context);
 	op.file_path = fs.ExpandPath(op.file_path, FileSystem::GetFileOpener(context));
 
-	bool use_tmp_file = op.is_file_and_exists && op.use_tmp_file && !op.per_thread_output;
-	if (use_tmp_file) {
+	if (op.use_tmp_file) {
 		op.file_path += ".tmp";
 	}
 	// COPY from select statement to file
 	auto copy =
 	    make_unique<PhysicalCopyToFile>(op.types, op.function, std::move(op.bind_data), op.estimated_cardinality);
 	copy->file_path = op.file_path;
-	copy->use_tmp_file = use_tmp_file;
+	copy->use_tmp_file = op.use_tmp_file;
 	copy->per_thread_output = op.per_thread_output;
 	if (op.function.parallel) {
 		copy->parallel = op.function.parallel(context, *copy->bind_data);

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

@@ -1,8 +1,8 @@
 #ifndef DUCKDB_VERSION
-#define DUCKDB_VERSION "0.6.2-dev1223"
+#define DUCKDB_VERSION "0.6.2-dev1226"
 #endif
 #ifndef DUCKDB_SOURCE_ID
-#define DUCKDB_SOURCE_ID "557f616c39"
+#define DUCKDB_SOURCE_ID "5b5c625783"
 #endif
 #include "duckdb/function/table/system_functions.hpp"
 #include "duckdb/main/database.hpp"

package/src/duckdb/src/include/duckdb/planner/operator/logical_copy_to_file.hpp

@@ -24,7 +24,6 @@ public:
 	unique_ptr<FunctionData> bind_data;
 	std::string file_path;
 	bool use_tmp_file;
-	bool is_file_and_exists;
 	bool per_thread_output;
 
 public:

package/src/duckdb/src/planner/binder/statement/bind_copy.cpp

@@ -62,6 +62,11 @@ BoundStatement Binder::BindCopyTo(CopyStatement &stmt) {
 	if (user_set_use_tmp_file && per_thread_output) {
 		throw NotImplementedException("Can't combine USE_TMP_FILE and PER_THREAD_OUTPUT for COPY");
 	}
+	bool is_file_and_exists = config.file_system->FileExists(stmt.info->file_path);
+	bool is_stdout = stmt.info->file_path == "/dev/stdout";
+	if (!user_set_use_tmp_file) {
+		use_tmp_file = is_file_and_exists && !per_thread_output && !is_stdout;
+	}
 
 	auto function_data =
 	    copy_function->function.copy_to_bind(context, *stmt.info, select_node.names, select_node.types);
@@ -70,7 +75,6 @@ BoundStatement Binder::BindCopyTo(CopyStatement &stmt) {
 	copy->file_path = stmt.info->file_path;
 	copy->use_tmp_file = use_tmp_file;
 	copy->per_thread_output = per_thread_output;
-	copy->is_file_and_exists = config.file_system->FileExists(copy->file_path);
 
 	copy->AddChild(std::move(select_node.plan));
 

package/src/duckdb/src/planner/operator/logical_copy_to_file.cpp

@@ -9,7 +9,6 @@ namespace duckdb {
 void LogicalCopyToFile::Serialize(FieldWriter &writer) const {
 	writer.WriteString(file_path);
 	writer.WriteField(use_tmp_file);
-	writer.WriteField(is_file_and_exists);
 	writer.WriteField(per_thread_output);
 
 	D_ASSERT(!function.name.empty());
@@ -26,7 +25,6 @@ void LogicalCopyToFile::Serialize(FieldWriter &writer) const {
 unique_ptr<LogicalOperator> LogicalCopyToFile::Deserialize(LogicalDeserializationState &state, FieldReader &reader) {
 	auto file_path = reader.ReadRequired<string>();
 	auto use_tmp_file = reader.ReadRequired<bool>();
-	auto is_file_and_exists = reader.ReadRequired<bool>();
 	auto per_thread_output = reader.ReadRequired<bool>();
 
 	auto copy_func_name = reader.ReadRequired<string>();
@@ -52,7 +50,6 @@ unique_ptr<LogicalOperator> LogicalCopyToFile::Deserialize(LogicalDeserializatio
 	auto result = make_unique<LogicalCopyToFile>(copy_func, std::move(bind_data));
 	result->file_path = file_path;
 	result->use_tmp_file = use_tmp_file;
-	result->is_file_and_exists = is_file_and_exists;
 	result->per_thread_output = per_thread_output;
 	return std::move(result);
 }