oc7o commented on PR #23188: URL: https://github.com/apache/datafusion/pull/23188#issuecomment-5196404291
@kosiew Sorry for the silence, resolved now. The previous round's conflicts (from #23704/#23735 landing on main): the only important one was `SIMILAR TO` type coercion in `type_coercion.rs`. Both my branch and main had independently added the same `regex_coercion` arm for `Expr::SimilarTo`. I reverted mine and kept main's version since it was already reviewed and merged there. The one I solved now was smaller but had a similar shape: a conflict in `datafusion/sql/src/expr/mod.rs` around the plan-time pattern-type check in `sql_similarto_to_expr`. Seems like main had already dropped that check entirely in #23735 (not just widened it to accept `LargeUtf8`/`Utf8View` like my branch did) The reasoning why they removed it was because the analyzers coercion now rejects non-string patterns anyway, and keeping a separate plan-time check was inconsistent with `LIKE`. I went with main's approach (removed the check) rather than keep mine, and updated the two tests that asserted on the old `Invalid pattern in SIMILAR TO expression` message (`strings.slt` and `type_coercion.slt`) to expect the analyzer's coercion error instead. Everything else auto-merged cleanly. 🐙 -- This is an automated message from the Apache Git Service. To respond to the message, please log on to GitHub and use the URL above to go to the specific comment. To unsubscribe, e-mail: [email protected] For queries about this service, please contact Infrastructure at: [email protected] --------------------------------------------------------------------- To unsubscribe, e-mail: [email protected] For additional commands, e-mail: [email protected]
