Advance deprecation status

NEWS.md

@@ -1,5 +1,9 @@
 # dbplyr (development version)
 
+* Deprecation status of functions deprecated in previous versions (at least
+  2 years old) have been advanced. In particular, `src_sql()` is now defunct,
+  as is the use of `partial_eval()` with character `data`.
+
 * `semi_join()` will no longer inline away an aggregate filter (i.e. `HAVING`
   clause) that was followed by a `select()` (@ejneer, #1474)
 

R/backend-teradata.R

@@ -221,7 +221,7 @@ utils::globalVariables(c("ATAN2", "SUBSTR", "DECIMAL", "WEEKNUMBER_OF_YEAR", "SU
 #' @export
 #' @rdname win_over
 win_rank_tdata <- function(f) {
-  lifecycle::deprecate_soft(
+  lifecycle::deprecate_warn(
     "2.4.0",
     what = "win_rank_tdata()",
     with = "win_rank()"

R/db-sql.R

@@ -823,9 +823,9 @@ sql_query_append <- function(con,
                              ...,
                              returning_cols = NULL) {
   if (is_tbl_lazy(from)) {
-    lifecycle::deprecate_soft(
+    lifecycle::deprecate_warn(
       when = "2.3.2",
-      what = "sql_query_append(from = 'must be a table identifier or an SQL query, not a lazy table.')",
+      what = "sql_query_append(from = 'must be a table identifier or an SQL query, not a lazy table.')"
     )
 
     insert_cols <- colnames(from)

R/src-sql.R

@@ -12,13 +12,11 @@
 #' @param con the connection object
 #' @param ... fields used by object
 src_sql <- function(subclass, con, ...) {
-  lifecycle::deprecate_warn(
+  lifecycle::deprecate_stop(
     when = "1.4.0",
     what = "src_sql()",
     always = TRUE
   )
-  subclass <- paste0("src_", subclass)
-  structure(list(con = con, ...), class = c(subclass, "src_sql", "src"))
 }
 
 

R/tidyeval.R

@@ -51,19 +51,16 @@
 #' f <- function(x) x + 1
 #' partial_eval(quote(year > f(1980)), lf)
 #' partial_eval(quote(year > local(f(1980))), lf)
-partial_eval <- function(call, data, env = caller_env(), vars = NULL, error_call) {
-  if (!is_null(vars)) {
-    lifecycle::deprecate_warn("2.1.2", "partial_eval(vars)", always = TRUE)
-    data <- lazy_frame(!!!rep_named(vars, list(logical())))
+partial_eval <- function(call,
+                         data,
+                         env = caller_env(),
+                         vars = deprecated(),
+                         error_call) {
+  if (lifecycle::is_present(vars)) {
+    lifecycle::deprecate_stop("2.1.2", "partial_eval(vars)")
   }
-
   if (is.character(data)) {
-    lifecycle::deprecate_warn(
-      "2.1.2",
-      "partial_eval(data = 'must be a lazy frame')",
-      always = TRUE
-    )
-    data <- lazy_frame(!!!rep_named(data, list(logical())))
+    lifecycle::deprecate_stop("2.1.2", "partial_eval(data = 'must be a lazy frame')", )
   }
 
   if (is_sql_literal(call)) {

R/verb-group_by.R

@@ -24,17 +24,11 @@
 #'   group_by(g) %>%
 #'   mutate(x2 = x / sum(x, na.rm = TRUE)) %>%
 #'   show_query()
-group_by.tbl_lazy <- function(.data, ..., .add = FALSE, add = NULL, .drop = TRUE) {
+group_by.tbl_lazy <- function(.data, ..., .add = FALSE, add = deprecated(), .drop = TRUE) {
   dots <- partial_eval_dots(.data, ..., .named = FALSE)
 
-  if (!missing(add)) {
-    lifecycle::deprecate_warn(
-      "1.0.0",
-      "dplyr::group_by(add = )",
-      "group_by(.add = )",
-      always = TRUE
-    )
-    .add <- add
+  if (lifecycle::is_present(add)) {
+    lifecycle::deprecate_stop("1.0.0", "dplyr::group_by(add)", "group_by(.add)")
   }
 
   check_unsupported_arg(.drop, TRUE)

R/verb-joins.R

@@ -584,7 +584,7 @@ join_prepare_by <- function(by,
                             user_env = caller_env(3)) {
   if (identical(by, character()) && is.null(sql_on)) {
     if (type != "cross") {
-      lifecycle::deprecate_soft(
+      lifecycle::deprecate_warn(
         when = "1.1.0",
         what = I("Using `by = character()` to perform a cross join"),
         with = "cross_join()",

tests/testthat/_snaps/tidyeval.md

@@ -0,0 +1,13 @@
+# old arguments are defunct
+
+    Code
+      partial_eval(quote(x), vars = c("x", "y"))
+    Condition
+      Error:
+      ! The `vars` argument of `partial_eval()` was deprecated in dbplyr 2.1.2 and is now defunct.
+    Code
+      partial_eval(quote(x), data = c("x", "y"))
+    Condition
+      Error:
+      ! The `data` argument of `partial_eval()` must be a lazy frame as of dbplyr 2.1.2.
+

tests/testthat/_snaps/verb-group_by.md

@@ -1,3 +1,12 @@
+# errors about add argument 
+
+    Code
+      gf <- mf %>% group_by(x) %>% group_by(y, add = TRUE)
+    Condition
+      Error:
+      ! The `add` argument of `group_by()` was deprecated in dplyr 1.0.0 and is now defunct.
+      i Please use the `.add` argument instead.
+
 # errors for .drop = FALSE
 
     Code

tests/testthat/test-tidyeval.R

@@ -73,3 +73,10 @@ test_that("fails with multi-classes", {
   x <- structure(list(), class = c('a', 'b'))
   expect_error(partial_eval(x, lf), "Unknown input type", fixed = TRUE)
 })
+
+test_that("old arguments are defunct", {
+  expect_snapshot(error = TRUE, {
+    partial_eval(quote(x), vars = c("x", "y"))
+    partial_eval(quote(x), data = c("x", "y"))
+  })
+})

tests/testthat/test-verb-group_by.R

@@ -7,13 +7,12 @@ test_that("group_by with .add = TRUE adds groups", {
   expect_equal(group_vars(gf2), c("x", "y"))
 })
 
-test_that("warns about add argument ", {
+test_that("errors about add argument ", {
   mf <- memdb_frame(x = 1:3, y = 1:3)
-  expect_warning(
+  expect_snapshot(
     gf <- mf %>% group_by(x) %>% group_by(y, add = TRUE),
-    "deprecated"
+    error = TRUE
   )
-  expect_equal(group_vars(gf), c("x", "y"))
 })
 
 test_that("errors for .drop = FALSE", {