tidyverse · krlmlr · Dec 10, 2023 · Sep 9, 2023 · Sep 10, 2023 · Nov 8, 2023
diff --git a/DESCRIPTION b/DESCRIPTION
@@ -21,7 +21,7 @@ Imports:
     cli,
     collections,
     DBI,
-    dplyr (>= 1.1.3),
+    dplyr (>= 1.1.4),
     duckdb (>= 0.9.1-1),
     glue,
     lifecycle,

diff --git a/NAMESPACE b/NAMESPACE
@@ -10,7 +10,6 @@ S3method(count,duckplyr_df)
 S3method(cross_join,duckplyr_df)
 S3method(distinct,duckplyr_df)
 S3method(do,duckplyr_df)
-S3method(dplyr_reconstruct,duckplyr_df)
 S3method(explain,duckplyr_df)
 S3method(full_join,duckplyr_df)
 S3method(group_vars,duckplyr_df)
@@ -355,4 +354,3 @@ importFrom(vctrs,vec_size)
 importFrom(vctrs,vec_slice)
 importFrom(vctrs,vec_split)
 importFrom(vctrs,vec_unique_loc)
-useDynLib(duckplyr, .registration = TRUE)
diff --git a/R/arrange.R b/R/arrange.R
@@ -37,7 +37,7 @@ arrange.duckplyr_df <- function(.data, ..., .by_group = FALSE, .locale = NULL) {
       }
 
       out <- rel_to_df(out_rel)
-      out <- dplyr_reconstruct_dispatch(out, .data)
+      out <- dplyr_reconstruct(out, .data)
       return(out)
     }
   )

diff --git a/R/count.R b/R/count.R
@@ -37,7 +37,7 @@ count.duckplyr_df <- function(x, ..., wt = NULL, sort = FALSE, name = NULL, .dro
       }
 
       out <- rel_to_df(out_rel)
-      out <- dplyr_reconstruct_dispatch(out, x)
+      out <- dplyr_reconstruct(out, x)
 
       return(out)
     }

diff --git a/R/distinct.R b/R/distinct.R
@@ -62,7 +62,7 @@ distinct.duckplyr_df <- function(.data, ..., .keep_all = FALSE) {
       }
 
       out <- rel_to_df(out_rel)
-      out <- dplyr_reconstruct_dispatch(out, .data)
+      out <- dplyr_reconstruct(out, .data)
       return(out)
     }
   )

diff --git a/R/dplyr.R b/R/dplyr.R
@@ -18,8 +18,6 @@ DataMask <- dplyr$DataMask
 dplyr_error_call <- dplyr$dplyr_error_call
 dplyr_local_error_call <- dplyr$dplyr_local_error_call
 dplyr_quosures <- dplyr$dplyr_quosures
-# FIXME: Unneeded after https://github.com/tidyverse/dplyr/pull/6927?
-dplyr_reconstruct_dispatch <- dplyr$dplyr_reconstruct_dispatch
 eval_relocate <- dplyr$eval_relocate
 eval_select_by <- dplyr$eval_select_by
 expand_across <- dplyr$expand_across

diff --git a/R/dplyr_reconstruct.R b/R/dplyr_reconstruct.R
diff --git a/R/duckplyr-package.R b/R/duckplyr-package.R
@@ -50,10 +50,13 @@
 #' @importFrom vctrs vec_slice
 #' @importFrom vctrs vec_split
 #' @importFrom vctrs vec_unique_loc
-#' @useDynLib duckplyr, .registration = TRUE
 ## usethis namespace: end
 NULL
 
+# Enable to use compiled code again
+# @useDynLib duckplyr, .registration = TRUE
+NULL
+
 #' @importFrom dplyr %>%
 #' @export
 dplyr::"%>%"

diff --git a/R/filter.R b/R/filter.R
@@ -25,7 +25,7 @@ filter.duckplyr_df <- function(.data, ..., .by = NULL, .preserve = FALSE) {
       out_rel <- oo_restore(rel)
 
       out <- rel_to_df(out_rel)
-      out <- dplyr_reconstruct_dispatch(out, .data)
+      out <- dplyr_reconstruct(out, .data)
       return(out)
     }
   )

diff --git a/R/head.R b/R/head.R
@@ -5,5 +5,5 @@ head.duckplyr_df <- function(x, n = 6L, ...) {
   rel <- duckdb_rel_from_df(x)
   out_rel <- rel_limit(rel, n)
   out <- rel_to_df(out_rel)
-  dplyr_reconstruct_dispatch(out, x)
+  dplyr_reconstruct(out, x)
 }
diff --git a/R/intersect.R b/R/intersect.R
@@ -30,7 +30,7 @@ intersect.duckplyr_df <- function(x, y, ...) {
 
         rel <- rel_set_intersect(x_rel, y_rel)
         out <- rel_to_df(rel)
-        out <- dplyr_reconstruct_dispatch(out, x)
+        out <- dplyr_reconstruct(out, x)
       }
       return(out)
     }

diff --git a/R/mutate.R b/R/mutate.R
@@ -49,7 +49,7 @@ mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used",
 
       out <- rel_to_df(rel)
 
-      out <- dplyr_reconstruct_dispatch(out, .data)
+      out <- dplyr_reconstruct(out, .data)
 
       names_original <- names(.data)
 

diff --git a/R/overwrite.R b/R/overwrite.R
@@ -10,7 +10,6 @@ methods_overwrite <- function() {
   vctrs::s3_register("dplyr::cross_join", "data.frame", cross_join.duckplyr_df)
   vctrs::s3_register("dplyr::distinct", "data.frame", distinct.duckplyr_df)
   vctrs::s3_register("dplyr::do", "data.frame", do.duckplyr_df)
-  vctrs::s3_register("dplyr::dplyr_reconstruct", "data.frame", dplyr_reconstruct.duckplyr_df)
   vctrs::s3_register("dplyr::filter", "data.frame", filter.duckplyr_df)
   vctrs::s3_register("dplyr::full_join", "data.frame", full_join.duckplyr_df)
   vctrs::s3_register("dplyr::group_vars", "data.frame", group_vars.duckplyr_df)

diff --git a/R/project.R b/R/project.R
@@ -14,5 +14,5 @@ nexprs <- function(names) {
 exprs_project <- function(rel, exprs, .data) {
   out_rel <- rel_project(rel, exprs)
   out <- rel_to_df(out_rel)
-  dplyr_reconstruct_dispatch(out, .data)
+  dplyr_reconstruct(out, .data)
 }
diff --git a/R/relational-altrep-wrap.R b/R/relational-altrep-wrap.R
diff --git a/R/restore.R b/R/restore.R
@@ -10,7 +10,6 @@ methods_restore <- function() {
   vctrs::s3_register("dplyr::cross_join", "data.frame", dplyr$cross_join.data.frame)
   vctrs::s3_register("dplyr::distinct", "data.frame", dplyr$distinct.data.frame)
   vctrs::s3_register("dplyr::do", "data.frame", dplyr$do.data.frame)
-  vctrs::s3_register("dplyr::dplyr_reconstruct", "data.frame", dplyr$dplyr_reconstruct.data.frame)
   vctrs::s3_register("dplyr::filter", "data.frame", dplyr$filter.data.frame)
   vctrs::s3_register("dplyr::full_join", "data.frame", dplyr$full_join.data.frame)
   vctrs::s3_register("dplyr::group_vars", "data.frame", dplyr$group_vars.data.frame)

diff --git a/R/setdiff.R b/R/setdiff.R
@@ -30,7 +30,7 @@ setdiff.duckplyr_df <- function(x, y, ...) {
 
         rel <- rel_set_diff(x_rel, y_rel)
         out <- rel_to_df(rel)
-        out <- dplyr_reconstruct_dispatch(out, x)
+        out <- dplyr_reconstruct(out, x)
       }
       return(out)
     }

diff --git a/R/symdiff.R b/R/symdiff.R
@@ -32,7 +32,7 @@ symdiff.duckplyr_df <- function(x, y, ...) {
 
         rel <- rel_set_symdiff(x_rel, y_rel)
         out <- rel_to_df(rel)
-        out <- dplyr_reconstruct_dispatch(out, x)
+        out <- dplyr_reconstruct(out, x)
       }
       return(out)
     }

diff --git a/R/transmute.R b/R/transmute.R
@@ -14,7 +14,7 @@ transmute.duckplyr_df <- function(.data, ...) {
       rel <- duckdb_rel_from_df(.data)
       out_rel <- rel_project(rel, exprs)
       out <- rel_to_df(out_rel)
-      out <- dplyr_reconstruct_dispatch(out, .data)
+      out <- dplyr_reconstruct(out, .data)
       return(out)
     }
   )

diff --git a/dplyr-methods/dplyr_reconstruct.txt b/dplyr-methods/dplyr_reconstruct.txt
diff --git a/patch/arrange.patch b/patch/arrange.patch
@@ -1,5 +1,5 @@
 diff --git b/R/arrange.R a/R/arrange.R
-index 5576a435..bfd2b81 100644
+index 5576a435..82a2e6f 100644
 --- b/R/arrange.R
 +++ a/R/arrange.R
 @@ -1,10 +1,43 @@
@@ -44,7 +44,7 @@ index 5576a435..bfd2b81 100644
 +      }
 +
 +      out <- rel_to_df(out_rel)
-+      out <- dplyr_reconstruct_dispatch(out, .data)
++      out <- dplyr_reconstruct(out, .data)
        return(out)
      }
    )
diff --git a/patch/count.patch b/patch/count.patch
@@ -1,5 +1,5 @@
 diff --git b/R/count.R a/R/count.R
-index 0b85569..1a74334 100644
+index 0b85569..ea3d310 100644
 --- b/R/count.R
 +++ a/R/count.R
 @@ -1,14 +1,51 @@
@@ -44,7 +44,7 @@ index 0b85569..1a74334 100644
 +      }
 +
 +      out <- rel_to_df(out_rel)
-+      out <- dplyr_reconstruct_dispatch(out, x)
++      out <- dplyr_reconstruct(out, x)
 +
        return(out)
      }

diff --git a/patch/distinct.patch b/patch/distinct.patch
@@ -1,5 +1,5 @@
 diff --git b/R/distinct.R a/R/distinct.R
-index 8628a27..4b81901 100644
+index 8628a27..0bcfd3c 100644
 --- b/R/distinct.R
 +++ a/R/distinct.R
 @@ -1,10 +1,68 @@
@@ -68,7 +68,7 @@ index 8628a27..4b81901 100644
 +      }
 +
 +      out <- rel_to_df(out_rel)
-+      out <- dplyr_reconstruct_dispatch(out, .data)
++      out <- dplyr_reconstruct(out, .data)
        return(out)
      }
    )
diff --git a/patch/dplyr_reconstruct.patch b/patch/dplyr_reconstruct.patch
diff --git a/patch/filter.patch b/patch/filter.patch
@@ -1,5 +1,5 @@
 diff --git b/R/filter.R a/R/filter.R
-index 787a374..1a83d69 100644
+index 787a374..19b1281 100644
 --- b/R/filter.R
 +++ a/R/filter.R
 @@ -1,10 +1,31 @@
@@ -33,7 +33,7 @@ index 787a374..1a83d69 100644
 +      out_rel <- oo_restore(rel)
 +
 +      out <- rel_to_df(out_rel)
-+      out <- dplyr_reconstruct_dispatch(out, .data)
++      out <- dplyr_reconstruct(out, .data)
        return(out)
      }
    )
diff --git a/patch/intersect.patch b/patch/intersect.patch
@@ -1,5 +1,5 @@
 diff --git b/R/intersect.R a/R/intersect.R
-index e080cd6..87e7f92 100644
+index e080cd6..d7446a7 100644
 --- b/R/intersect.R
 +++ a/R/intersect.R
 @@ -2,9 +2,36 @@
@@ -35,7 +35,7 @@ index e080cd6..87e7f92 100644
 +
 +        rel <- rel_set_intersect(x_rel, y_rel)
 +        out <- rel_to_df(rel)
-+        out <- dplyr_reconstruct_dispatch(out, x)
++        out <- dplyr_reconstruct(out, x)
 +      }
        return(out)
      }

diff --git a/patch/mutate.patch b/patch/mutate.patch
@@ -55,7 +55,7 @@ index 50437cc..b67af99 100644
 +
 +      out <- rel_to_df(rel)
 +
-+      out <- dplyr_reconstruct_dispatch(out, .data)
++      out <- dplyr_reconstruct(out, .data)
 +
 +      names_original <- names(.data)
 +

diff --git a/patch/setdiff.patch b/patch/setdiff.patch
@@ -1,5 +1,5 @@
 diff --git b/R/setdiff.R a/R/setdiff.R
-index 314dcd7..cd2a470 100644
+index 314dcd7..23852ec 100644
 --- b/R/setdiff.R
 +++ a/R/setdiff.R
 @@ -2,9 +2,36 @@
@@ -35,7 +35,7 @@ index 314dcd7..cd2a470 100644
 +
 +        rel <- rel_set_diff(x_rel, y_rel)
 +        out <- rel_to_df(rel)
-+        out <- dplyr_reconstruct_dispatch(out, x)
++        out <- dplyr_reconstruct(out, x)
 +      }
        return(out)
      }

diff --git a/patch/symdiff.patch b/patch/symdiff.patch
@@ -1,5 +1,5 @@
 diff --git b/R/symdiff.R a/R/symdiff.R
-index dbd08df..14b28dd 100644
+index dbd08df..f99c084 100644
 --- b/R/symdiff.R
 +++ a/R/symdiff.R
 @@ -2,9 +2,38 @@
@@ -37,7 +37,7 @@ index dbd08df..14b28dd 100644
 +
 +        rel <- rel_set_symdiff(x_rel, y_rel)
 +        out <- rel_to_df(rel)
-+        out <- dplyr_reconstruct_dispatch(out, x)
++        out <- dplyr_reconstruct(out, x)
 +      }
        return(out)
      }

diff --git a/patch/transmute.patch b/patch/transmute.patch
@@ -1,5 +1,5 @@
 diff --git b/R/transmute.R a/R/transmute.R
-index b0257fd..feb9447 100644
+index b0257fd..3690230 100644
 --- b/R/transmute.R
 +++ a/R/transmute.R
 @@ -1,10 +1,20 @@
@@ -21,7 +21,7 @@ index b0257fd..feb9447 100644
 +      rel <- duckdb_rel_from_df(.data)
 +      out_rel <- rel_project(rel, exprs)
 +      out <- rel_to_df(out_rel)
-+      out <- dplyr_reconstruct_dispatch(out, .data)
++      out <- dplyr_reconstruct(out, .data)
        return(out)
      }
    )
diff --git a/src/.gitignore b/src/.gitignore