tidyverse · krlmlr · Mar 11, 2024 · Mar 8, 2024 · Mar 8, 2024 · Mar 8, 2024
diff --git a/.sync/.gitignore b/.sync/.gitignore
@@ -1,5 +1,5 @@
 /dplyr-main/
 /dplyr-revdep/
 /dplyr-cloud/
-/problems/
+/problems*/
 *.tar.gz
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -1,7 +1,7 @@
 Type: Package
 Package: duckplyr
 Title: A 'DuckDB'-Backed Version of 'dplyr'
-Version: 0.3.0.9007
+Version: 0.3.1
 Authors@R: c(
     person("Hannes", "Mühleisen", role = "aut",
            comment = c(ORCID = "0000-0001-8552-0029")),

diff --git a/NAMESPACE b/NAMESPACE
@@ -10,12 +10,9 @@ S3method(count,duckplyr_df)
 S3method(cross_join,duckplyr_df)
 S3method(distinct,duckplyr_df)
 S3method(do,duckplyr_df)
-S3method(dplyr_col_modify,duckplyr_df)
-S3method(dplyr_row_slice,duckplyr_df)
 S3method(explain,duckplyr_df)
 S3method(full_join,duckplyr_df)
 S3method(group_by,duckplyr_df)
-S3method(group_data,duckplyr_df)
 S3method(group_indices,duckplyr_df)
 S3method(group_keys,duckplyr_df)
 S3method(group_map,duckplyr_df)
@@ -228,7 +225,6 @@ export(union)
 export(union_all)
 export(vars)
 export(with_groups)
-import(cli)
 import(rlang)
 importFrom(collections,dict)
 importFrom(collections,queue)
@@ -348,7 +344,6 @@ importFrom(tibble,is_tibble)
 importFrom(tibble,new_tibble)
 importFrom(tibble,tibble)
 importFrom(tidyselect,everything)
-importFrom(utils,globalVariables)
 importFrom(utils,head)
 importFrom(vctrs,new_data_frame)
 importFrom(vctrs,new_list_of)

diff --git a/NEWS.md b/NEWS.md
@@ -1,139 +1,37 @@
 <!-- NEWS.md is maintained by https://fledge.cynkra.com, contributors should not edit this file -->
 
-# duckplyr 0.3.0.9007 (2024-03-08)
+# duckplyr 0.3.1 (2024-03-08)
 
 ## Bug fixes
 
-- Improve and test fallback telemetry (#115).
-
-- Fix autoupload and other telemetry details (#113).
+- Forbid reuse of new columns created in `summarise()` (#72, #106).
+- `summarise()` no longer restores subclass.
+- Disambiguate computation of `log10()` and `log()`.
+- Fix division by zero for positive and negative numbers.
 
 ## Features
 
+- New `fallback_sitrep()` and related functionality for collecting telemetry data (#102, #107, #110, #111, #115). No data is collected by default, only a message is displayed once per session and then every eight hours. Opt in or opt out by setting environment variables.
+- Implement `group_by()` and other methods to collect fallback information (#94, #104, #105).
+- Set memory limit and temporary directory for duckdb.
+- Implement `suppressWarnings()` as the identity function.
 - Prefer `cli::cli_abort()` over `stop()` or `rlang::abort()` (#114).
+- Translate `.data$a` and `.env$a`.
+- Strict checks for column class, only supporting `integer`, `numeric`, `logical`, `Date`, `POSIXct`, and `difftime` for now.
+- If the environment variable `DUCKPLYR_METHODS_OVERWRITE` is set to `TRUE`, loading duckplyr automatically calls `methods_overwrite()`.
 
-## Chore
-
-- Better default fallback message.
-
-- Add telemetry for joins.
-
-- Better scrubbing for telemetry (#110).
-
-- Update patches (#109).
-
-## Documentation
-
-- Tweak README.
-
-- Tweak description of environment variables and document.
-
-- Tweak messages.
-
-- Telementry -\> telemetry (@TimTaylor, #112).
-
-- Clarify default.
-
-- New `fallback_sitrep()` and related functionality for collecting telemetry data (#102, #111).
-
-
-# duckplyr 0.3.0.9006 (2024-03-08)
-
-## Bug fixes
-
-  - Forbid reuse of new columns created in `summarize()` (#72, #106).
-
-## Chore
-
-  - Add calls for telemetry (#107).
-
-  - Implement almost all dplyr methods (#105).
-
-  - Implement `group_by()` and other methods to collect fallback information (#94, #104).
-
-  - Update TPC/H scripts.
-
-  - Implement `suppressWarnings()` as the identity function.
-
-  - Document.
-
-  - Remove bad patch.
-
-## Uncategorized
-
-  - Merge pull request #103 from duckdblabs/f-cleanup-autogen.
-
-
-# duckplyr 0.3.0.9005 (2024-02-23)
-
-## Chore
-
-  - Better duckdb tests.
+## Internal
 
-
-# duckplyr 0.3.0.9004 (2024-02-10)
-
-## Features
-
-  - Translate `.data$a` and `.env$a`.
-
-  - Permit `difftime` columns.
-
-## Chore
-
-  - Document.
-
-  - Update tests.
-
-  - Better `.sync/.gitignore`.
-
-  - Use standalone purrr for dplyr compatibility.
-
-
-# duckplyr 0.3.0.9003 (2024-02-05)
-
-## Bug fixes
-
-  - Disambiguate computation of `log10()` and `log()`.
-
-  - Test for `log10()`.
-
-  - `summarise()` no longer restores subclass.
-
-  - Fix division by zero for positive and negative numbers.
-
-## Features
-
-  - Permit `POSIXct` columns.
-
-  - Strict checks for column class, only supporting `integer`, `numeric`, `logical` and `Date` for now.
-
-## Chore
-
-  - Set memory limit and temporary directory for duckdb.
-
-## Continuous integration
-
-  - Use newer Action version to fix build on Windows.
+- Better duckdb tests.
+- Use standalone purrr for dplyr compatibility.
 
 ## Testing
 
-  - Add tests for correct base of `log()` and `log10()`.
-
-
-# duckplyr 0.3.0.9002 (2024-01-24)
-
-  - Internal changes only.
-
+- Add tests for correct base of `log()` and `log10()`.
 
-# duckplyr 0.3.0.9001 (2024-01-15)
-
-  - Internal changes only.
-
-
-# duckplyr 0.3.0.9000 (2023-12-11)
+## Documentation
 
-  - Merge branch 'cran-0.3.0'.
+- `methods_overwrite()` and `methods_restore()` show a message.
 
 
 # duckplyr 0.3.0 (2023-12-10)

diff --git a/R/as_duckplyr_df.R b/R/as_duckplyr_df.R
@@ -26,11 +26,11 @@ as_duckplyr_df <- function(.data) {
   }
 
   if (!identical(class(.data), "data.frame") && !identical(class(.data), c("tbl_df", "tbl", "data.frame"))) {
-    cli_abort("Must pass a plain data frame or a tibble to `as_duckplyr_df()`.")
+    cli::cli_abort("Must pass a plain data frame or a tibble to `as_duckplyr_df()`.")
   }
 
   if (anyNA(names(.data)) || any(names(.data) == "")) {
-    cli_abort("Missing or empty names not allowed.")
+    cli::cli_abort("Missing or empty names not allowed.")
   }
 
   class(.data) <- c("duckplyr_df", class(.data))

diff --git a/R/config.R b/R/config.R
@@ -28,6 +28,9 @@
 #' to certain duckdb functions.
 #' Currently unused.
 #'
+#' `DUCKPLYR_METHODS_OVERWRITE`: If `TRUE`, call `methods_overwrite()`
+#' when the package is loaded.
+#'
 #' See [fallback] for more options related to logging and uploading of fallback events.
 #'
 # Not available in the CRAN package:

diff --git a/R/count.R b/R/count.R
@@ -20,7 +20,7 @@ count.duckplyr_df <- function(x, ..., wt = NULL, sort = FALSE, name = NULL, .dro
       name <- check_n_name(name, by_chr)
 
       if (name %in% by_chr) {
-        cli_abort("Name clash in `count()`")
+        cli::cli_abort("Name clash in `count()`")
       }
 
       n <- tally_n(x, {{ wt }})

diff --git a/R/distinct.R b/R/distinct.R
@@ -1,5 +1,5 @@
 # Generated by 02-duckplyr_df-methods.R
-globalVariables("___row_number_by")
+utils::globalVariables("___row_number_by")
 
 #' @export
 distinct.duckplyr_df <- function(.data, ..., .keep_all = FALSE) {

diff --git a/R/dplyr_col_modify.R b/R/dplyr_col_modify.R
diff --git a/R/dplyr_row_slice.R b/R/dplyr_row_slice.R
diff --git a/R/duckplyr-package.R b/R/duckplyr-package.R
@@ -4,8 +4,11 @@
 # @rawNamespace import(vctrs, except = data_frame)
 # an alternative for importing nearly everything from vctrs
 # https://github.com/tidyverse/dplyr/blob/16b472fb2afc50a87502c2b4ed803e2f5f82b9d6/R/dplyr.R#L7
+#
+# Can't use blanket cli import, imports must align with dplyr's imports
+# (except we can import all of dplyr)
+#
 #' @import rlang
-#' @import cli
 ## usethis namespace: start
 #' @importFrom collections dict
 #' @importFrom collections queue
@@ -25,7 +28,6 @@
 #' @importFrom tibble new_tibble
 #' @importFrom tibble tibble
 #' @importFrom tidyselect everything
-#' @importFrom utils globalVariables
 #' @importFrom utils head
 #' @importFrom vctrs new_data_frame
 #' @importFrom vctrs new_list_of