Skip to content

Commit e4ed18c

Browse files
No '_' in names
1 parent f62efd9 commit e4ed18c

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

R/bmerge.R

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ coerce_col = function(dt, col, from_type, to_type, from_name, to_name, from_deta
2828
# data.table::as.ITime, chron::times, nanotime::nanotime
2929
.known_time_classes = c("Date", "POSIXt", "ITime", "times", "nanotime")
3030
# nolint next: object_length_linter.
31-
.maybe_warn_mismatched_time_types = function(x_class, i_class, x_name, i_name) {
31+
.maybe_warn_mismatched_time_types = function(x_class, i_class, xname, iname) {
3232
x_class_time = intersect(x_class, .known_time_classes)
3333
if (!length(x_class_time)) return(invisible())
3434

@@ -109,7 +109,7 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
109109
stopf("Incompatible join types: %s (%s) and %s (%s). Factor columns must join to factor or character columns.", xname, x_merge_type, iname, i_merge_type)
110110
}
111111

112-
.maybe_warn_mismatched_time_types(class(x[[xcol]]), class(i[[icol]]), x_name, i_name)
112+
.maybe_warn_mismatched_time_types(class(x[[xcol]]), class(i[[icol]]), xname, iname)
113113

114114
if (x_merge_type == i_merge_type) {
115115
if (verbose) catf("%s has same type (%s) as %s. No coercion needed.\n", iname, x_merge_type, xname)

0 commit comments

Comments
 (0)