Skip to content
Closed
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
8 changes: 4 additions & 4 deletions R/joins.R
Original file line number Diff line number Diff line change
Expand Up @@ -57,17 +57,17 @@ join_dt <- function(op) {
#' @export
#' @rdname join.tbl_dt
#' @importFrom dplyr inner_join
inner_join.data.table <- join_dt({merge(x, y, by = by$x, allow.cartesian = TRUE)})
inner_join.data.table <- join_dt({merge(x, y, by = by$x, allow.cartesian = TRUE, ...)})

#' @export
#' @importFrom dplyr left_join
#' @rdname join.tbl_dt
left_join.data.table <- join_dt({merge(x, y, by = by$x, all.x = TRUE, allow.cartesian = TRUE)})
left_join.data.table <- join_dt({merge(x, y, by = by$x, all.x = TRUE, allow.cartesian = TRUE, ...)})

#' @export
#' @importFrom dplyr right_join
#' @rdname join.tbl_dt
right_join.data.table <- join_dt(merge(x, y, by = by$x, all.y = TRUE, allow.cartesian = TRUE))
right_join.data.table <- join_dt(merge(x, y, by = by$x, all.y = TRUE, allow.cartesian = TRUE, ...))

#' @export
#' @importFrom dplyr semi_join
Expand All @@ -88,4 +88,4 @@ anti_join.data.table <- join_dt({x[!y, allow.cartesian = TRUE]})
#' @importFrom dplyr full_join
#' @rdname join.tbl_dt
# http://stackoverflow.com/a/15170956/946850
full_join.data.table <- join_dt({merge(x, y, by = by$x, all = TRUE, allow.cartesian = TRUE)})
full_join.data.table <- join_dt({merge(x, y, by = by$x, all = TRUE, allow.cartesian = TRUE, ...)})
13 changes: 13 additions & 0 deletions tests/testthat/test-joins.R
Original file line number Diff line number Diff line change
Expand Up @@ -28,3 +28,16 @@ test_that("joining data tables returns data tables (#470) and does not modify th
}
}
})

test_that("merge.data.table parameters", {
a <- data.table(x = c(1, 1, 2, 3), dupname = 4:1)
b <- data.table(x = c(1, 2, 2, 4), dupname = 1:4)

lj <- left_join(a, b, by = "x")
expect_true("dupname.x" %in% names(lj))
expect_false("dupname.a" %in% names(lj))

lj <- left_join(a, b, by = "x", suffix = c(".a", ".b"))
expect_true("dupname.a" %in% names(lj))
expect_false("dupname.x" %in% names(lj))
})