Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion DESCRIPTION
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ Imports:
cli,
collections,
DBI,
dplyr (>= 1.1.4),
dplyr (>= 1.1.4.9000),
duckdb (>= 0.10.2),
glue,
jsonlite,
Expand Down
21 changes: 13 additions & 8 deletions R/dplyr-reimplement.R
Original file line number Diff line number Diff line change
Expand Up @@ -5,14 +5,19 @@ duckplyr_mutate_keep <- function(out, keep, used, names_new, names_groups) {

names <- names(out)

names_keep <- switch(keep,
used = names(used)[used],
unused = names(used)[!used],
none = character(),
abort("Unknown `keep`.", .internal = TRUE)
)

names_out <- intersect(names, c(names_new, names_groups, names_keep))
if (keep == "transmute") {
names_groups <- setdiff(names_groups, names_new)
names_out <- c(names_groups, names_new)
} else {
names_keep <- switch(
keep,
used = names(used)[used],
unused = names(used)[!used],
none = character(),
abort("Unknown `keep`.", .internal = TRUE)
)
names_out <- intersect(names, c(names_new, names_groups, names_keep))
}

select(out, !!!names_out)
}
6 changes: 4 additions & 2 deletions R/mutate.R
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
# Generated by 02-duckplyr_df-methods.R
#' @export
mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used", "unused", "none"), .before = NULL, .after = NULL) {
mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used", "unused", "none", "transmute"), .before = NULL, .after = NULL) {
by_arg <- enquo(.by)
keep <- arg_match(.keep)

Expand Down Expand Up @@ -55,6 +55,7 @@ mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used",

out <- mutate_relocate(
out = out,
keep = keep,
before = {{ .before }},
after = {{ .after }},
names_original = names_original
Expand All @@ -81,7 +82,7 @@ mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used",
return(out)

# dplyr implementation
keep <- arg_match0(.keep, values = c("all", "used", "unused", "none"))
keep <- arg_match0(.keep, values = c("all", "used", "unused", "none", "transmute"))

by <- compute_by({{ .by }}, .data, by_arg = ".by", data_arg = ".data")

Expand All @@ -94,6 +95,7 @@ mutate.duckplyr_df <- function(.data, ..., .by = NULL, .keep = c("all", "used",

out <- mutate_relocate(
out = out,
keep = keep,
before = {{ .before }},
after = {{ .after }},
names_original = names_original
Expand Down