Skip to content

Commit c7a6d02

Browse files
authored
fix add_years() translation on spark (#1511)
1 parent 7fb52d7 commit c7a6d02

File tree

3 files changed

+3
-2
lines changed

3 files changed

+3
-2
lines changed

NEWS.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,7 @@
88

99
* `across(everything())` doesn't select grouping columns created via `.by` in
1010
`summarise()` (@mgirlich, #1493).
11+
* `clock::add_years()` translates to correct SQL on Spark (@ablack3, #1510).
1112

1213
* New translations of clock function `date_count_between()` for SQL server, Redshift, Snowflake, Postgres, and Spark (@edward-burn, #1495).
1314

R/backend-spark-sql.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ simulate_spark_sql <- function() simulate_dbi("Spark SQL")
4444
},
4545
add_years = function(x, n, ...) {
4646
check_dots_empty()
47-
sql_expr(add_months(!!!x, !!n*12))
47+
sql_expr(add_months(!!x, !!n*12))
4848
},
4949
date_build = function(year, month = 1L, day = 1L, ..., invalid = NULL) {
5050
sql_expr(make_date(!!year, !!month, !!day))

tests/testthat/test-backend-spark-sql.R

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
test_that("custom clock functions translated correctly", {
22
local_con(simulate_spark_sql())
3-
expect_equal(test_translate_sql(add_years(x, 1)), sql("ADD_MONTHS('`x`', 1.0 * 12.0)"))
3+
expect_equal(test_translate_sql(add_years(x, 1)), sql("ADD_MONTHS(`x`, 1.0 * 12.0)"))
44
expect_equal(test_translate_sql(add_days(x, 1)), sql("DATE_ADD(`x`, 1.0)"))
55
expect_error(test_translate_sql(add_days(x, 1, "dots", "must", "be empty")))
66
expect_equal(test_translate_sql(date_build(2020, 1, 1)), sql("MAKE_DATE(2020.0, 1.0, 1.0)"))

0 commit comments

Comments
 (0)