Skip to content

Commit f62efd9

Browse files
move back up
1 parent 5f35729 commit f62efd9

File tree

1 file changed

+3
-2
lines changed

1 file changed

+3
-2
lines changed

R/bmerge.R

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,9 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
108108
}
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
}
111+
112+
.maybe_warn_mismatched_time_types(class(x[[xcol]]), class(i[[icol]]), x_name, i_name)
113+
111114
if (x_merge_type == i_merge_type) {
112115
if (verbose) catf("%s has same type (%s) as %s. No coercion needed.\n", iname, x_merge_type, xname)
113116
next
@@ -176,8 +179,6 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
176179
}
177180
}
178181

179-
.maybe_warn_mismatched_time_types(class(x[[xcol]]), class(i[[icol]]), x_name, i_name)
180-
181182
## after all modifications of x, check if x has a proper key on all xcols.
182183
## If not, calculate the order. Also for non-equi joins, the order must be calculated.
183184
non_equi = which.first(ops != 1L) # 1 is "==" operator

0 commit comments

Comments
 (0)