diff --git a/NEWS.md b/NEWS.md index 3f43e475..78d52f3c 100755 --- a/NEWS.md +++ b/NEWS.md @@ -40,6 +40,7 @@ * Edited `ggplot_rsi` and `geom_rsi` so they can cope with `count_df`. The new `fun` parameter has value `portion_df` at default, but can be set to `count_df`. * Fix for `ggplot_rsi` when the `ggplot2` package was not loaded * Added possibility to set any parameter to `geom_rsi` (and `ggplot_rsi`) so you can set your own preferences +* Fix for joins, where predefined suffices would not be honoured * Support for types list and matrix for `freq` ```r my_matrix = with(septic_patients, matrix(c(age, sex), ncol = 2)) diff --git a/R/join_microorganisms.R b/R/join_microorganisms.R index 35c2b313..6e54d110 100755 --- a/R/join_microorganisms.R +++ b/R/join_microorganisms.R @@ -37,7 +37,7 @@ inner_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) { joinby <- by } join <- suppressWarnings( - dplyr::inner_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) + dplyr::inner_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...) ) if (nrow(join) > nrow(x)) { warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') @@ -59,7 +59,7 @@ left_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) { joinby <- by } join <- suppressWarnings( - dplyr::left_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) + dplyr::left_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...) ) if (nrow(join) > nrow(x)) { warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') @@ -81,7 +81,7 @@ right_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) { joinby <- by } join <- suppressWarnings( - dplyr::right_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) + dplyr::right_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...) ) if (nrow(join) > nrow(x)) { warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original') @@ -103,7 +103,7 @@ full_join_microorganisms <- function(x, by = 'mo', suffix = c("2", ""), ...) { joinby <- by } join <- suppressWarnings( - dplyr::full_join(x = x, y = AMR::microorganisms, by = joinby, suffix = c("2", ""), ...) + dplyr::full_join(x = x, y = AMR::microorganisms, by = joinby, suffix = suffix, ...) ) if (nrow(join) > nrow(x)) { warning('the newly joined tbl contains ', nrow(join) - nrow(x), ' rows more that its original')