Skip to content

ARROW-17673: [R] desc in dplyr::arrange should allow dplyr:: prefix #14090

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

Merged
nealrichardson merged 2 commits into from
Sep 15, 2022
Merged

ARROW-17673: [R] desc in dplyr::arrange should allow dplyr:: prefix #14090

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ec6f2dc
allow `dplyr::desc`
eitsupi Sep 10, 2022
f6019fb
add tests
eitsupi Sep 10, 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
2 changes: 1 addition & 1 deletion r/R/dplyr-arrange.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -76,7 +76,7 @@ find_and_remove_desc <- function(quosure) {
if (identical(expr[[1]], quote(`(`))) {
# remove enclosing parentheses
expr <- expr[[2]]
} else if (identical(expr[[1]], quote(desc))) {
} else if (identical(expr[[1]], quote(desc)) || identical(expr[[1]], quote(dplyr::desc))) {
# ensure desc() has only one argument (when an R expression is a function
# call, length == 2 means it has exactly one argument)
if (length(expr) > 2) {
Expand Down
26 changes: 26 additions & 0 deletions r/tests/testthat/test-dplyr-arrange.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,19 +33,38 @@ test_that("arrange() on integer, double, and character columns", {
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int, dplyr::desc(dbl)) %>%
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int, desc(desc(dbl))) %>%
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int, dplyr::desc(dplyr::desc(dbl))) %>%
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int) %>%
arrange(desc(dbl)) %>%
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int) %>%
arrange(dplyr::desc(dbl)) %>%
collect(),
tbl
)
compare_dplyr_binding(
.input %>%
arrange(int + dbl, chr) %>%
Expand Down Expand Up @@ -200,4 +219,11 @@ test_that("arrange() with bad inputs", {
"expects only one argument",
fixed = TRUE
)
expect_error(
tbl %>%
Table$create() %>%
arrange(dplyr::desc(int, chr)),
"expects only one argument",
fixed = TRUE
)
})