Better errors for .default vectorised

Author: thisisnic

r/R/dplyr-funcs-conditional.R

@@ -282,7 +282,7 @@ register_bindings_conditional <- function() {
       value <- parsed$value
       if (!is.null(.default)) {
         if (length(.default) != 1) {
-          validation_error(paste0("`.default` must have size 1, not size ", length(.default), "."))
+          arrow_not_supported("`case_when()` with vectorized `.default`")
         }
         n <- length(query)
         query[[n + 1]] <- TRUE
@@ -326,6 +326,9 @@ register_bindings_conditional <- function() {
       if (!is.null(ptype)) {
         arrow_not_supported("`recode_values()` with `ptype` specified")
       }
+      if (!unmatched %in% c("default", "error")) {
+        validation_error('`unmatched` must be either "default" or "error"')
+      }
       if (unmatched == "error") {
         arrow_not_supported("`recode_values()` with `unmatched = \"error\"`")
       }
@@ -338,6 +341,9 @@ register_bindings_conditional <- function() {
       value <- parsed$value
 
       if (!is.null(default)) {
+        if (length(default) != 1) {
+          arrow_not_supported("`recode_values()` with vectorized `default`")
+        }
         n <- length(query)
         query[[n + 1]] <- TRUE
         value[[n + 1]] <- Expression$scalar(default)

r/tests/testthat/test-dplyr-funcs-conditional.R

@@ -296,8 +296,8 @@ test_that("case_when()", {
   )
   expect_arrow_eval_error(
     case_when(int > 5 ~ 1, .default = c(0, 1)),
-    "`.default` must have size 1, not size 2",
-    class = "validation_error"
+    "`case_when\\(\\)` with vectorized `.default` not supported in Arrow",
+    class = "arrow_not_supported"
   )
 
   expect_arrow_eval_error(
@@ -783,4 +783,14 @@ test_that("recode_values()", {
     "`recode_values\\(\\)` with `unmatched = \"error\"` not supported in Arrow",
     class = "arrow_not_supported"
   )
+  expect_arrow_eval_error(
+    recode_values(chr, "a" ~ "A", unmatched = "wat"),
+    '`unmatched` must be either "default" or "error"',
+    class = "validation_error"
+  )
+  expect_arrow_eval_error(
+    recode_values(chr, "a" ~ "A", default = c("x", "y")),
+    "`recode_values\\(\\)` with vectorized `default` not supported in Arrow",
+    class = "arrow_not_supported"
+  )
 })