Merge pull request duckdb#158 from lschneiderbauer/n_distinct_followup

Tmonster · May 27, 2024 · 56004c8 · 56004c8
2 parents 40d6c8f + 2476d20
commit 56004c8
Show file tree

Hide file tree

Showing 2 changed files with 12 additions and 0 deletions.
diff --git a/R/backend-dbplyr__duckdb_connection.R b/R/backend-dbplyr__duckdb_connection.R
@@ -79,6 +79,12 @@ duckdb_grepl <- function(pattern, x, ignore.case = FALSE, perl = FALSE, fixed =
 
 duckdb_n_distinct <- function(..., na.rm = FALSE) {
   sql <- pkg_method("sql", "dbplyr")
+  check_dots_unnamed <- pkg_method("check_dots_unnamed", "rlang")
+
+  if (missing(...)) {
+    stop("`...` is absent, but must be supplied.")
+  }
+  check_dots_unnamed()
 
   if (!identical(na.rm, FALSE)) {
     stop("Parameter `na.rm = TRUE` in n_distinct() is currently not supported in DuckDB backend.", call. = FALSE)

diff --git a/tests/testthat/test-backend-dbplyr__duckdb_connection.R b/tests/testthat/test-backend-dbplyr__duckdb_connection.R
@@ -284,6 +284,7 @@ test_that("n_distinct() computations are correct", {
   on.exit(dbDisconnect(con, shutdown = TRUE))
   tbl <- dplyr::tbl
   summarize <- dplyr::summarize
+  mutate <- dplyr::mutate
   pull <- dplyr::pull
 
   duckdb_register(con, "df", data.frame(x = c(1, 1, 2, 2), y = c(1, 2, 2, 2)))
@@ -318,6 +319,11 @@ test_that("n_distinct() computations are correct", {
     pull(summarize(df_na, n = n_distinct(x, y)), n),
     5
   )
+
+  expect_equal(
+    pull(mutate(df_na, n = n_distinct(x, y)), n),
+    rep(5, 5)
+  )
 })