Merge branch 'main' into add-missing-conditional-functions

Author: timsaucer

crates/core/src/functions.rs

@@ -496,6 +496,11 @@ expr_fn!(chr, arg, "Returns the character with the given code.");
 expr_fn_vec!(coalesce);
 expr_fn_vec!(greatest);
 expr_fn_vec!(least);
+expr_fn!(
+    contains,
+    string search_str,
+    "Return true if search_str is found within string (case-sensitive)."
+);
 expr_fn!(cos, num);
 expr_fn!(cosh, num);
 expr_fn!(cot, num);
@@ -968,6 +973,7 @@ pub(crate) fn init_module(m: &Bound<'_, PyModule>) -> PyResult<()> {
     m.add_wrapped(wrap_pyfunction!(col))?;
     m.add_wrapped(wrap_pyfunction!(concat_ws))?;
     m.add_wrapped(wrap_pyfunction!(concat))?;
+    m.add_wrapped(wrap_pyfunction!(contains))?;
     m.add_wrapped(wrap_pyfunction!(corr))?;
     m.add_wrapped(wrap_pyfunction!(cos))?;
     m.add_wrapped(wrap_pyfunction!(cosh))?;

python/datafusion/functions.py

@@ -116,6 +116,7 @@
     "col",
     "concat",
     "concat_ws",
+    "contains",
     "corr",
     "cos",
     "cosh",
@@ -443,6 +444,20 @@ def digest(value: Expr, method: Expr) -> Expr:
     return Expr(f.digest(value.expr, method.expr))
 
 
+def contains(string: Expr, search_str: Expr) -> Expr:
+    """Returns true if ``search_str`` is found within ``string`` (case-sensitive).
+
+    Examples:
+        >>> ctx = dfn.SessionContext()
+        >>> df = ctx.from_pydict({"a": ["the quick brown fox"]})
+        >>> result = df.select(
+        ...     dfn.functions.contains(dfn.col("a"), dfn.lit("brown")).alias("c"))
+        >>> result.collect_column("c")[0].as_py()
+        True
+    """
+    return Expr(f.contains(string.expr, search_str.expr))
+
+
 def concat(*args: Expr) -> Expr:
     """Concatenates the text representations of all the arguments.
 

python/tests/test_functions.py

@@ -745,6 +745,7 @@ def test_array_function_obj_tests(stmt, py_expr):
             f.split_part(column("a"), literal("l"), literal(1)),
             pa.array(["He", "Wor", "!"]),
         ),
+        (f.contains(column("a"), literal("ell")), pa.array([True, False, False])),
         (f.starts_with(column("a"), literal("Wor")), pa.array([False, True, False])),
         (f.strpos(column("a"), literal("o")), pa.array([5, 2, 0], type=pa.int32())),
         (