chore: Sync

Author: krlmlr

patch/compute.patch

@@ -1,38 +1,37 @@
 diff --git b/R/compute.R a/R/compute.R
 --- b/R/compute.R
 +++ a/R/compute.R
-@@ -1,10 +1,45 @@
+@@ -1,10 +1,44 @@
  # Generated by 02-duckplyr_df-methods.R
 +#' @rdname compute.duckplyr_df
  #' @export
 -compute.duckplyr_df <- function(x, ...) {
 +compute.duckplyr_df <- function(
 +  x,
 +  ...,
-+  lazy = NULL,
++  funnel = NULL,
 +  name = NULL,
 +  schema_name = NULL,
 +  temporary = TRUE
 +) {
++  if (is.null(funnel)) {
++    funnel <- get_funnel_duckplyr_df(x)
++  }
++  if (is.null(schema_name)) {
++    schema_name <- ""
++  }
++  if (is.null(name)) {
++    if (isTRUE(temporary)) {
++      name <- unique_table_name()
++    } else {
++      cli::cli_abort("{.arg name} must be provided if {.arg temporary} is {.value FALSE}")
++    }
++  }
++
    # Our implementation
    duckplyr_error <- rel_try(NULL,
 -    "No relational implementation for {.code compute()}" = TRUE,
-+    "Needs duckdb >= 1.1.3.9029" = !is_installed("duckdb", version = "1.1.3.9029"),
      {
-+      if (is.null(lazy)) {
-+        lazy <- is_lazy_duckplyr_df(x)
-+      }
-+      if (is.null(schema_name)) {
-+        schema_name <- ""
-+      }
-+      if (is.null(name)) {
-+        if (isTRUE(temporary)) {
-+          name <- unique_table_name()
-+        } else {
-+          cli::cli_abort("{.arg name} must be provided if {.arg temporary} is {.value FALSE}")
-+        }
-+      }
-+
 +      rel <- duckdb_rel_from_df(x)
 +
 +      duckdb$rel_to_table(rel, schema_name, name, temporary)
@@ -42,8 +41,8 @@ diff --git b/R/compute.R a/R/compute.R
 +
 +      out <- duckplyr_reconstruct(out_rel, x)
 +
-+      if (is_lazy_duckplyr_df(out) != lazy) {
-+        out <- as_duckdb_tibble(out, .lazy = lazy)
++      if (get_funnel_duckplyr_df(out) != funnel) {
++        out <- as_duckdb_tibble(out, funnel = funnel)
 +      }
 +
        return(out)

tests/testthat/test-as_duckplyr_df.R

@@ -247,8 +247,6 @@ test_that("as_duckplyr_df_impl() and compute()", {
 
 
 test_that("as_duckplyr_df_impl() and compute()", {
-  withr::local_envvar(DUCKPLYR_FORCE = TRUE)
-
   # Data
   test_df <- data.frame(a = 1:6 + 0, b = 2, g = rep(1:3, 1:3))
 
@@ -681,8 +679,6 @@ test_that("as_duckplyr_df_impl() and full_join(join_by(a))", {
 })
 
 test_that("as_duckplyr_df_impl() and group_by()", {
-  withr::local_envvar(DUCKPLYR_FORCE = "FALSE")
-
   skip("Grouped")
 
   # Data

tests/testthat/test-rel_api.R

@@ -16849,17 +16849,13 @@ test_that("relational symdiff() order-preserving", {
       }
     )
   )
-  df3 <- data.frame(a = 1L, b = 2)
+  df3 <- data.frame(a = 5L, b = 2)
 
   "union_all"
   rel9 <- duckdb$rel_from_df(con, df3, experimental = experimental)
-  df4 <- data.frame(a = 5L, b = 2)
-
-  "union_all"
-  rel10 <- duckdb$rel_from_df(con, df4, experimental = experimental)
   "union_all"
-  rel11 <- duckdb$rel_project(
-    rel9,
+  rel10 <- duckdb$rel_project(
+    rel8,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -16888,8 +16884,8 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "union_all"
-  rel12 <- duckdb$rel_project(
-    rel10,
+  rel11 <- duckdb$rel_project(
+    rel9,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -16918,15 +16914,15 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "union_all"
-  rel13 <- duckdb$rel_union_all(rel11, rel12)
+  rel12 <- duckdb$rel_union_all(rel10, rel11)
   "union_all"
-  rel14 <- duckdb$rel_order(
-    rel13,
+  rel13 <- duckdb$rel_order(
+    rel12,
     list(duckdb$expr_reference("___row_number_x"), duckdb$expr_reference("___row_number_y"))
   )
   "union_all"
-  rel15 <- duckdb$rel_project(
-    rel14,
+  rel14 <- duckdb$rel_project(
+    rel13,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -16941,8 +16937,8 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "distinct"
-  rel16 <- duckdb$rel_project(
-    rel15,
+  rel15 <- duckdb$rel_project(
+    rel14,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -16962,8 +16958,8 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "distinct"
-  rel17 <- duckdb$rel_project(
-    rel16,
+  rel16 <- duckdb$rel_project(
+    rel15,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -17001,8 +16997,8 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "distinct"
-  rel18 <- duckdb$rel_filter(
-    rel17,
+  rel17 <- duckdb$rel_filter(
+    rel16,
     list(
       duckdb$expr_comparison(
         "==",
@@ -17018,10 +17014,10 @@ test_that("relational symdiff() order-preserving", {
     )
   )
   "distinct"
-  rel19 <- duckdb$rel_order(rel18, list(duckdb$expr_reference("___row_number")))
+  rel18 <- duckdb$rel_order(rel17, list(duckdb$expr_reference("___row_number")))
   "distinct"
-  rel20 <- duckdb$rel_project(
-    rel19,
+  rel19 <- duckdb$rel_project(
+    rel18,
     list(
       {
         tmp_expr <- duckdb$expr_reference("a")
@@ -17035,8 +17031,8 @@ test_that("relational symdiff() order-preserving", {
       }
     )
   )
-  rel20
-  out <- duckdb$rel_to_altrep(rel20)
+  rel19
+  out <- duckdb$rel_to_altrep(rel19)
   expect_identical(
     out,
     data.frame(a = c(1L, 5L), b = 2)