Skip to content

Commit 73fb757

Browse files
move warning after coerce_col() section
1 parent 7c733cf commit 73fb757

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
@@ -109,8 +109,6 @@ 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)
113-
114112
if (x_merge_type == i_merge_type) {
115113
if (verbose) catf("%s has same type (%s) as %s. No coercion needed.\n", iname, x_merge_type, xname)
116114
next
@@ -179,6 +177,8 @@ bmerge = function(i, x, icols, xcols, roll, rollends, nomatch, mult, ops, verbos
179177
}
180178
}
181179

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

0 commit comments

Comments
 (0)