Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

use type checkers in backend-snowflake.R #1554

Merged
merged 4 commits into from
Nov 1, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 5 additions & 0 deletions NEWS.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,10 @@
# dbplyr (development version)

* Tightened argument checks for Snowflake SQL translations. These changes should
result in more informative errors in cases where code already failed; if you
see errors with code that used to run without issue, please report them to
the package authors (@simonpcouch, #1554).

* `clock::add_years()` translates to correct SQL on Spark (@ablack3, #1510).

* Translations for `as.double()` and `as.character()` with Teradata previously
Expand Down
30 changes: 16 additions & 14 deletions R/backend-snowflake.R
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ sql_translation.Snowflake <- function(con) {
paste = snowflake_paste(" "),
paste0 = snowflake_paste(""),
str_c = function(..., sep = "", collapse = NULL) {
check_string(sep)
if (!is.null(collapse)) {
cli_abort(c(
"{.arg collapse} not supported in DB translation of {.fn str_c}.",
Expand All @@ -40,6 +41,7 @@ sql_translation.Snowflake <- function(con) {
},
str_detect = function(string, pattern, negate = FALSE) {
con <- sql_current_con()
check_bool(negate)

# Snowflake needs backslashes escaped, so we must increase the level of escaping
pattern <- gsub("\\", "\\\\", pattern, fixed = TRUE)
Expand All @@ -51,6 +53,7 @@ sql_translation.Snowflake <- function(con) {
},
str_starts = function(string, pattern, negate = FALSE) {
con <- sql_current_con()
check_bool(negate)

# Snowflake needs backslashes escaped, so we must increase the level of escaping
pattern <- gsub("\\", "\\\\", pattern, fixed = TRUE)
Expand All @@ -62,6 +65,7 @@ sql_translation.Snowflake <- function(con) {
},
str_ends = function(string, pattern, negate = FALSE) {
con <- sql_current_con()
check_bool(negate)

# Snowflake needs backslashes escaped, so we must increase the level of escaping
pattern <- gsub("\\", "\\\\", pattern, fixed = TRUE)
Expand Down Expand Up @@ -111,6 +115,9 @@ sql_translation.Snowflake <- function(con) {
sql_expr(EXTRACT(DAY %FROM% !!x))
},
wday = function(x, label = FALSE, abbr = TRUE, week_start = NULL) {
check_bool(label)
check_bool(abbr)
simonpcouch marked this conversation as resolved.
Show resolved Hide resolved
check_number_whole(week_start, allow_null = TRUE)
if (!label) {
week_start <- week_start %||% getOption("lubridate.week.start", 7)
offset <- as.integer(7 - week_start)
Expand Down Expand Up @@ -140,6 +147,8 @@ sql_translation.Snowflake <- function(con) {
},
isoweek = function(x) sql_expr(EXTRACT("weekiso", !!x)),
month = function(x, label = FALSE, abbr = TRUE) {
check_bool(label)
check_bool(abbr)
if (!label) {
sql_expr(EXTRACT("month", !!x))
} else {
Expand Down Expand Up @@ -167,6 +176,7 @@ sql_translation.Snowflake <- function(con) {
}
},
quarter = function(x, with_year = FALSE, fiscal_start = 1) {
check_bool(with_year)
check_unsupported_arg(fiscal_start, 1)

if (with_year) {
Expand Down Expand Up @@ -220,6 +230,8 @@ sql_translation.Snowflake <- function(con) {
sql_expr(DATEADD(YEAR, !!n, !!x))
},
date_build = function(year, month = 1L, day = 1L, ..., invalid = NULL) {
check_dots_empty()
check_unsupported_arg(invalid, allowed = NULL)
# https://docs.snowflake.com/en/sql-reference/functions/date_from_parts
sql_expr(DATE_FROM_PARTS(!!year, !!month, !!day))
},
Expand All @@ -235,25 +247,15 @@ sql_translation.Snowflake <- function(con) {
date_count_between = function(start, end, precision, ..., n = 1L){

check_dots_empty()
if (precision != "day") {
cli_abort("{.arg precision} must be {.val day} on SQL backends.")
}
if (n != 1) {
cli_abort("{.arg n} must be {.val 1} on SQL backends.")
}
check_unsupported_arg(precision, allowed = "day")
check_unsupported_arg(n, allowed = 1L)

sql_expr(DATEDIFF(DAY, !!start, !!end))
},

difftime = function(time1, time2, tz, units = "days") {

if (!missing(tz)) {
cli::cli_abort("The {.arg tz} argument is not supported for SQL backends.")
}

if (units[1] != "days") {
cli::cli_abort('The only supported value for {.arg units} on SQL backends is "days"')
}
check_unsupported_arg(tz)
check_unsupported_arg(units, allowed = "days")

sql_expr(DATEDIFF(DAY, !!time2, !!time1))
},
Expand Down
16 changes: 0 additions & 16 deletions tests/testthat/_snaps/backend-snowflake.md
Original file line number Diff line number Diff line change
Expand Up @@ -7,22 +7,6 @@
! `collapse` not supported in DB translation of `paste()`.
i Please use `str_flatten()` instead.

# difftime is translated correctly

Code
test_translate_sql(difftime(start_date, end_date, units = "auto"))
Condition
Error in `difftime()`:
! The only supported value for `units` on SQL backends is "days"

---

Code
test_translate_sql(difftime(start_date, end_date, tz = "UTC", units = "days"))
Condition
Error in `difftime()`:
! The `tz` argument is not supported for SQL backends.

# pmin() and pmax() respect na.rm

Code
Expand Down
22 changes: 14 additions & 8 deletions tests/testthat/test-backend-snowflake.R
Original file line number Diff line number Diff line change
Expand Up @@ -120,22 +120,28 @@ test_that("custom clock functions translated correctly", {
expect_equal(test_translate_sql(get_day(date_column)), sql("DATE_PART(DAY, `date_column`)"))
expect_equal(test_translate_sql(date_count_between(date_column_1, date_column_2, "day")),
sql("DATEDIFF(DAY, `date_column_1`, `date_column_2`)"))
expect_error(test_translate_sql(date_count_between(date_column_1, date_column_2, "year")))
expect_error(test_translate_sql(date_count_between(date_column_1, date_column_2, "day", n = 5)))
expect_error(
test_translate_sql(date_count_between(date_column_1, date_column_2, "year")),
class = "dbplyr_error_unsupported_arg"
)
expect_error(
test_translate_sql(date_count_between(date_column_1, date_column_2, "day", n = 5)),
class = "dbplyr_error_unsupported_arg"
)
})

test_that("difftime is translated correctly", {
local_con(simulate_snowflake())
expect_equal(test_translate_sql(difftime(start_date, end_date, units = "days")), sql("DATEDIFF(DAY, `end_date`, `start_date`)"))
expect_equal(test_translate_sql(difftime(start_date, end_date)), sql("DATEDIFF(DAY, `end_date`, `start_date`)"))

expect_snapshot(
error = TRUE,
test_translate_sql(difftime(start_date, end_date, units = "auto"))
expect_error(
test_translate_sql(difftime(start_date, end_date, units = "auto")),
class = "dbplyr_error_unsupported_arg"
)
expect_snapshot(
error = TRUE,
test_translate_sql(difftime(start_date, end_date, tz = "UTC", units = "days"))
expect_error(
test_translate_sql(difftime(start_date, end_date, tz = "UTC", units = "days")),
class = "dbplyr_error_unsupported_arg"
)
})

Expand Down
Loading