Isolate change

duckdb · Apr 24, 2024 · 7cc8a19 · 7cc8a19
1 parent 8cb9c62
commit 7cc8a19
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 4 deletions.
diff --git a/src/include/typesr.hpp b/src/include/typesr.hpp
@@ -115,7 +115,7 @@ struct RApiTypes {
 	static LogicalType LogicalTypeFromRType(const RType &rtype, bool experimental);
 	static string DetectLogicalType(const LogicalType &stype, const char *caller);
 	static R_len_t GetVecSize(RType rtype, SEXP coldata);
-	static Value SexpToValue(SEXP valsexp, R_len_t idx);
+	static Value SexpToValue(SEXP valsexp, R_len_t idx, bool typed_logical_null = true);
 	static SEXP ValueToSexp(Value &val, string &timezone_config);
 };
 

diff --git a/src/relational.cpp b/src/relational.cpp
@@ -64,7 +64,7 @@ external_pointer<T> make_external_prot(const string &rclass, SEXP prot, ARGS &&.
 	if (LENGTH(val) != 1) {
 		stop("expr_constant: Need value of length one");
 	}
-	return make_external<ConstantExpression>("duckdb_expr", RApiTypes::SexpToValue(val, 0));
+	return make_external<ConstantExpression>("duckdb_expr", RApiTypes::SexpToValue(val, 0, false));
 }
 
 [[cpp11::register]] SEXP rapi_expr_function(std::string name, list args, list order_bys, list filter_bys) {

diff --git a/src/utils.cpp b/src/utils.cpp
@@ -114,12 +114,12 @@ R_len_t RApiTypes::GetVecSize(RType rtype, SEXP coldata) {
 	return Rf_length(coldata);
 }
 
-Value RApiTypes::SexpToValue(SEXP valsexp, R_len_t idx) {
+Value RApiTypes::SexpToValue(SEXP valsexp, R_len_t idx, bool typed_logical_null) {
 	auto rtype = RApiTypes::DetectRType(valsexp, false); // TODO
 	switch (rtype.id()) {
 	case RType::LOGICAL: {
 		auto lgl_val = INTEGER_POINTER(valsexp)[idx];
-		return RBooleanType::IsNull(lgl_val) ? Value(LogicalType::SQLNULL) : Value::BOOLEAN(lgl_val);
+		return RBooleanType::IsNull(lgl_val) ? Value(typed_logical_null ? LogicalType::BOOLEAN : LogicalType::SQLNULL) : Value::BOOLEAN(lgl_val);
 	}
 	case RType::INTEGER: {
 		auto int_val = INTEGER_POINTER(valsexp)[idx];