Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Compatibility with dplyr 1.1.0 #30

Merged
merged 4 commits into from
Dec 19, 2022
Merged

Compatibility with dplyr 1.1.0 #30

Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
4e7bc5a
Use `all_of()` with external vectors
lionel- Dec 14, 2022
02c8b06
Fix tidyselect interpolation
lionel- Dec 14, 2022
cdd6c30
Supply `multiple = "all"` to silence warning
lionel- Dec 14, 2022
dd63e9e
Don't supply potentially unknown `suffix` argument
lionel- Dec 14, 2022
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
16 changes: 8 additions & 8 deletions R/dtrackr.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -930,7 +930,7 @@ p_count_subgroup = function(.data, .subgroup, ..., .messages=.defaultCountSubgro
# .headline is a single glue spec
tmpHead = .summaryToNodesDf(
# we need to make tmp unique here (on a per group basis)
tmp %>% select(-c(.name, .count, .subgroup)) %>% distinct(),
tmp %>% select(-c(.name, .count, all_of(.subgroup))) %>% distinct(),
.headline,.isHeader=TRUE, .type = .type, .env=.env)

# .messages is a load of glue specs
Expand Down Expand Up @@ -1403,7 +1403,7 @@ p_rename = function(.data, ..., .messages = "", .headline = "", .tag=NULL) {
#' @inheritParams dplyr::rename_with
#' @export
p_rename_with = function(.data, .fn, .cols = tidyselect::everything(), ..., .messages = "", .headline = "", .tag=NULL) {
.doMutate(dplyr::rename_with, .data, .fn = .fn, .cols = .cols, ..., .messages=.messages, .headline = .headline, .type="rename_with", .tag=.tag)
.doMutate(dplyr::rename_with, .data, .fn = .fn, .cols = {{ .cols }}, ..., .messages=.messages, .headline = .headline, .type="rename_with", .tag=.tag)
}

#' @inherit p_mutate
Expand Down Expand Up @@ -1953,7 +1953,7 @@ p_setdiff = function(x, y, ..., .messages="{.count.out} items in difference", .h

### Joins ----

.doJoin = function(joinFunction, x, y, by, copy, suffix, ..., .messages, .headline) {
.doJoin = function(joinFunction, x, y, by, copy, ..., .messages, .headline) {

mergedGraph = .mergeGraphs(x %>% p_get(), y %>% p_get())
x = x %>% .untrack()
Expand All @@ -1972,7 +1972,7 @@ p_setdiff = function(x, y, ..., .messages="{.count.out} items in difference", .h
}
.count.lhs = nrow(x)
.count.rhs = nrow(y)
out = joinFunction(x, y, by=by, copy=copy, suffix=suffix, ...)
out = joinFunction(x, y, by=by, copy=copy, ...)
.count.out = nrow(out)
out = out %>% p_set(mergedGraph) %>% .comment(.messages, .headline = .headline, .type="combine")
return(out %>% .retrack())
Expand Down Expand Up @@ -2015,7 +2015,7 @@ p_setdiff = function(x, y, ..., .messages="{.count.out} items in difference", .h
#' @export
#' @example inst/examples/join-examples.R
p_inner_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ..., .messages = c("{.count.lhs} on LHS","{.count.rhs} on RHS","{.count.out} in linked set"), .headline="Inner join by {.keys}") {
.doJoin(dplyr::inner_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., .messages = .messages, .headline = .headline)
.doJoin(dplyr::inner_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., .messages = .messages, .headline = .headline, multiple = "all")
}

#' Left join
Expand All @@ -2039,7 +2039,7 @@ p_inner_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ...,
#' @export
#' @example inst/examples/join-examples.R
p_left_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ... , keep = FALSE, .messages = c("{.count.lhs} on LHS","{.count.rhs} on RHS","{.count.out} in linked set"), .headline="Left join by {.keys}") {
.doJoin(dplyr::left_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline)
.doJoin(dplyr::left_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline, multiple = "all")
}

#' Right join
Expand All @@ -2063,7 +2063,7 @@ p_left_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ... ,
#' @export
#' @example inst/examples/join-examples.R
p_right_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ..., keep = FALSE, .messages = c("{.count.lhs} on LHS","{.count.rhs} on RHS","{.count.out} in linked set"), .headline="Right join by {.keys}") {
.doJoin(dplyr::right_join, x=x, y=y, by=by, copy=copy,suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline)
.doJoin(dplyr::right_join, x=x, y=y, by=by, copy=copy,suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline, multiple = "all")
}

#' Full join
Expand All @@ -2087,7 +2087,7 @@ p_right_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ...,
#' @export
#' @example inst/examples/join-examples.R
p_full_join = function(x, y, by = NULL, copy=FALSE, suffix=c(".x", ".y"), ..., keep = FALSE, .messages = c("{.count.lhs} on LHS","{.count.rhs} on RHS","{.count.out} in linked set"), .headline="Full join by {.keys}") {
.doJoin(dplyr::full_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline)
.doJoin(dplyr::full_join, x=x, y=y, by=by, copy=copy, suffix=suffix, ..., keep = keep, .messages = .messages, .headline = .headline, multiple = "all")
}

#' Semi join
Expand Down