Skip to content

Commit 21c7bcb

Browse files
committed
chore: Sync
1 parent 532b881 commit 21c7bcb

File tree

4 files changed

+31
-25
lines changed

4 files changed

+31
-25
lines changed

patch/mutate.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ diff --git b/R/mutate.R a/R/mutate.R
2929
+
3030
+ names_used <- character()
3131
+ names_new <- character()
32-
+ current_data <- rel_to_df(rel)
32+
+ current_data <- rel_to_df(rel, prudence = "frugal")
3333
+
3434
+ # FIXME: use fewer projections
3535
+ for (i in seq_along(dots)) {
@@ -77,7 +77,7 @@ diff --git b/R/mutate.R a/R/mutate.R
7777
+ }
7878
+
7979
+ rel <- rel_project(rel, unname(exprs))
80-
+ current_data <- rel_to_df(rel)
80+
+ current_data <- rel_to_df(rel, prudence = "frugal")
8181
+ }
8282
+
8383
+ if (length(by_names) > 0) {

patch/summarise.patch

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -58,9 +58,9 @@ diff --git b/R/summarise.R a/R/summarise.R
5858
+ out_rel <- oo_restore(out_rel, "___row_number")
5959
+ }
6060
+
61-
+ out <- rel_to_df(out_rel)
61+
+ out <- rel_to_df(out_rel, prudence = get_prudence_duckplyr_df(.data))
6262
+ # https://github.com/tidyverse/dplyr/pull/6988
63-
+ class(out) <- intersect(c("duckplyr_df", "tbl_df", "tbl", "data.frame"), class(.data))
63+
+ class(out) <- intersect(c("prudent_duckplyr_df", "duckplyr_df", "tbl_df", "tbl", "data.frame"), class(.data))
6464
+
6565
return(out)
6666
}

tests/testthat/test-rel_api.R

Lines changed: 25 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -16682,13 +16682,17 @@ test_that("relational symdiff() order-preserving", {
1668216682
}
1668316683
)
1668416684
)
16685-
df3 <- data.frame(a = 5L, b = 2)
16685+
df3 <- data.frame(a = 1L, b = 2)
1668616686

1668716687
"union_all"
1668816688
rel9 <- duckdb$rel_from_df(con, df3, experimental = experimental)
16689+
df4 <- data.frame(a = 5L, b = 2)
16690+
1668916691
"union_all"
16690-
rel10 <- duckdb$rel_project(
16691-
rel8,
16692+
rel10 <- duckdb$rel_from_df(con, df4, experimental = experimental)
16693+
"union_all"
16694+
rel11 <- duckdb$rel_project(
16695+
rel9,
1669216696
list(
1669316697
{
1669416698
tmp_expr <- duckdb$expr_reference("a")
@@ -16717,8 +16721,8 @@ test_that("relational symdiff() order-preserving", {
1671716721
)
1671816722
)
1671916723
"union_all"
16720-
rel11 <- duckdb$rel_project(
16721-
rel9,
16724+
rel12 <- duckdb$rel_project(
16725+
rel10,
1672216726
list(
1672316727
{
1672416728
tmp_expr <- duckdb$expr_reference("a")
@@ -16747,15 +16751,15 @@ test_that("relational symdiff() order-preserving", {
1674716751
)
1674816752
)
1674916753
"union_all"
16750-
rel12 <- duckdb$rel_union_all(rel10, rel11)
16754+
rel13 <- duckdb$rel_union_all(rel11, rel12)
1675116755
"union_all"
16752-
rel13 <- duckdb$rel_order(
16753-
rel12,
16756+
rel14 <- duckdb$rel_order(
16757+
rel13,
1675416758
list(duckdb$expr_reference("___row_number_x"), duckdb$expr_reference("___row_number_y"))
1675516759
)
1675616760
"union_all"
16757-
rel14 <- duckdb$rel_project(
16758-
rel13,
16761+
rel15 <- duckdb$rel_project(
16762+
rel14,
1675916763
list(
1676016764
{
1676116765
tmp_expr <- duckdb$expr_reference("a")
@@ -16770,8 +16774,8 @@ test_that("relational symdiff() order-preserving", {
1677016774
)
1677116775
)
1677216776
"distinct"
16773-
rel15 <- duckdb$rel_project(
16774-
rel14,
16777+
rel16 <- duckdb$rel_project(
16778+
rel15,
1677516779
list(
1677616780
{
1677716781
tmp_expr <- duckdb$expr_reference("a")
@@ -16791,8 +16795,8 @@ test_that("relational symdiff() order-preserving", {
1679116795
)
1679216796
)
1679316797
"distinct"
16794-
rel16 <- duckdb$rel_project(
16795-
rel15,
16798+
rel17 <- duckdb$rel_project(
16799+
rel16,
1679616800
list(
1679716801
{
1679816802
tmp_expr <- duckdb$expr_reference("a")
@@ -16830,8 +16834,8 @@ test_that("relational symdiff() order-preserving", {
1683016834
)
1683116835
)
1683216836
"distinct"
16833-
rel17 <- duckdb$rel_filter(
16834-
rel16,
16837+
rel18 <- duckdb$rel_filter(
16838+
rel17,
1683516839
list(
1683616840
duckdb$expr_comparison(
1683716841
"==",
@@ -16847,10 +16851,10 @@ test_that("relational symdiff() order-preserving", {
1684716851
)
1684816852
)
1684916853
"distinct"
16850-
rel18 <- duckdb$rel_order(rel17, list(duckdb$expr_reference("___row_number")))
16854+
rel19 <- duckdb$rel_order(rel18, list(duckdb$expr_reference("___row_number")))
1685116855
"distinct"
16852-
rel19 <- duckdb$rel_project(
16853-
rel18,
16856+
rel20 <- duckdb$rel_project(
16857+
rel19,
1685416858
list(
1685516859
{
1685616860
tmp_expr <- duckdb$expr_reference("a")
@@ -16864,8 +16868,8 @@ test_that("relational symdiff() order-preserving", {
1686416868
}
1686516869
)
1686616870
)
16867-
rel19
16868-
out <- duckdb$rel_to_altrep(rel19)
16871+
rel20
16872+
out <- duckdb$rel_to_altrep(rel20)
1686916873
expect_identical(
1687016874
out,
1687116875
data.frame(a = c(1L, 5L), b = 2)

tools/05-duckdb-tests.R

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,7 @@
11
source("tools/00-funs.R", echo = TRUE)
22

3+
Sys.setenv("DUCKPLYR_META_ENABLE" = "TRUE")
4+
35
pkgload::load_all()
46

57
first_line <- paste0(

0 commit comments

Comments
 (0)