changes + updates from previous PR (date_build, difftime)

Author: IoannaNika

R/backend-dbplyr__duckdb_connection.R

@@ -308,15 +308,14 @@ sql_translation.duckdb_connection <- function(con) {
 
       },
       date_build = function(year, month = 1L, day = 1L, ..., invalid = NULL) {
-        dbplyr:::check_unsupported_arg(invalid, allow_null = TRUE)
+        check_unsupported_arg(invalid, allow_null = TRUE)
         rlang::check_dots_empty()
-        build_sql("MAKE_DATE(CAST(", year, " AS INTEGER), CAST(", month, " AS INTEGER), CAST(", day, " AS INTEGER))")
-
+        dbplyr::sql_expr(MAKE_DATE(!!year, !!month, !!day))
       },
       difftime = function(time1, time2, tz, units = "days") {
-        dbplyr:::check_unsupported_arg(tz)
-        dbplyr:::check_unsupported_arg(units, allowed = "days")
-        build_sql("DATEDIFF('day', ", !!time2, ", " ,!!time1, ")")
+        check_unsupported_arg(tz)
+        check_unsupported_arg(units, allowed = "days")
+        dbplyr::sql_expr(DATEDIFF("day", !!time2, !!time1))
       },
 
       # stringr functions

R/check_unsupported_arg.R

@@ -0,0 +1,50 @@
+#' Check for unsupported argument values
+#'
+#' The function checks whether a given argument is unsupported
+#' It throws an error message if the argument is not among the allowed values.
+#' Function is taken from dplyr.
+#'
+#' @param x The argument to check.
+#' @param allowed A value or vector of values that are allowed for `x`. If `NULL`, no value is allowed.
+#' @param allow_null Logical. If `TRUE`, allows `x` to be `NULL`.
+#' @param backend Optional character string indicating the back-end.
+#' @param arg The name of the argument being checked (automatically inferred via `rlang::caller_arg()`).
+#' @param call The calling environment used for error reporting (automatically inferred via `rlang::caller_env()`).
+#'
+#' @noRd
+check_unsupported_arg <- function (x, allowed = NULL, allow_null = FALSE, backend = NULL,
+                                   arg = caller_arg(x), call = caller_env())
+{
+  if (rlang::is_missing(x)) {
+    return()
+  }
+  if (allow_null && rlang::is_null(x)) {
+    return()
+  }
+  if (identical(x, allowed)) {
+    return()
+  }
+  if (rlang::is_null(allowed)) {
+    msg <- "Argument {.arg {arg}} isn't supported"
+  }
+  else {
+    msg <- "{.code {arg} = {.val {x}}} isn't supported"
+  }
+  if (is.null(backend)) {
+    msg <- paste0(msg, " on database backends.")
+  }
+  else {
+    msg <- paste0(msg, " in {backend} translation.")
+  }
+  if (!rlang::is_null(allowed)) {
+    if (allow_null) {
+      allow_msg <- "It must be {.val {allowed}} or {.code NULL} instead."
+    }
+    else {
+      allow_msg <- "It must be {.val {allowed}} instead."
+    }
+    msg <- c(msg, i = allow_msg)
+  }
+  cli_abort(msg, call = call)
+}
+

src/duckdb/ub_src_function_table_system-6d8b1e5a.o.tmp

@@ -152,9 +152,9 @@ test_that("custom clock functions translated correctly", {
                                             precision = "day")),
                sql(r"{DATEDIFF('day', start, end)}"))
 
-  expect_equal(translate(difftime(time1 = "time1", time2 = "time2", units = "days")), sql(r"{DATEDIFF('day', time2, time1)}"))
-  expect_equal(translate(date_build(year = 2000L, month = 8L, day = 8L)), sql(r"{MAKE_DATE(CAST(2000.0 AS INTEGER), CAST(8.0 AS INTEGER), CAST(8.0 AS INTEGER))}"))
-  expect_equal(translate(date_build(year = 2000)), sql(r"{MAKE_DATE(CAST(2000.0 AS INTEGER), CAST(1 AS INTEGER), CAST(1 AS INTEGER))}"))
+  expect_equal(translate(difftime(time1 = "time1", time2 = "time2", units = "days")), sql(r"{DATEDIFF('day', 'time2', 'time1')}"))
+  expect_equal(translate(date_build(year = 2000L, month = 8L, day = 8L)), sql(r"{MAKE_DATE(2000, 8, 8)}"))
+  expect_equal(translate(date_build(year = 2000)), sql(r"{MAKE_DATE(2000.0, 1, 1)}"))
 
   test_data <- data.frame(
     person = 1L,