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

fixedd #6556 #6675

Closed
wants to merge 2 commits into from
Closed

fixedd #6556 #6675

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
135d2c1
fixedd #6556
venom1204 Dec 20, 2024
1abfa34
final
venom1204 Dec 20, 2024
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
20 changes: 14 additions & 6 deletions R/merge.R
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,10 +35,14 @@
if (!is.null(by.x)) {
if (length(by.x)==0L || !is.character(by.x) || !is.character(by.y))
stopf("A non-empty vector of column names is required for `by.x` and `by.y`.")
if (!all(by.x %chin% nm_x))
stopf("Elements listed in `by.x` must be valid column names in x.")
if (!all(by.y %chin% nm_y))
stopf("Elements listed in `by.y` must be valid column names in y.")
if (!all(by.x %chin% nm_x)) {
missing_by_x = setdiff(by.x, nm_x)
stopf("Elements listed in `by.x` must be valid column names in x. Missing: %s", toString(missing_by_x)) # changed here
}
if (!all(by.y %chin% nm_y)) {
missing_by_y = setdiff(by.y, nm_y)
stopf("Elements listed in `by.y` must be valid column names in y. Missing: %s", toString(missing_by_y)) # changed here
}
by = by.x
names(by) = by.y
} else {
Expand All @@ -50,8 +54,12 @@
by = intersect(nm_x, nm_y)
if (length(by) == 0L || !is.character(by))
stopf("A non-empty vector of column names for `by` is required.")
if (!all(by %chin% intersect(nm_x, nm_y)))
stopf("Elements listed in `by` must be valid column names in x and y")
if (!all(by %chin% intersect(nm_x, nm_y))) {
missing_in_x = setdiff(by, nm_x)
missing_in_y = setdiff(by, nm_y)
stopf("Elements listed in `by` must be valid column names in x and y. Missing in x: %s. Missing in y: %s",

Check warning on line 60 in R/merge.R

View workflow job for this annotation

GitHub Actions / lint-r 

file=R/merge.R,line=60,col=113,[trailing_whitespace_linter] Remove trailing whitespace.

Check warning on line 60 in R/merge.R

View workflow job for this annotation

GitHub Actions / lint-r 

file=R/merge.R,line=60,col=113,[trailing_whitespace_linter] Remove trailing whitespace.
toString(missing_in_x), toString(missing_in_y)) # changed here
}
by = unname(by)
by.x = by.y = by
}
Expand Down
Loading