fix: resolve merge conflicts

Author: richtia

datafusion/tests/test_functions.py

@@ -533,6 +533,7 @@ def test_string_functions(df):
         f.translate(column("a"), literal("or"), literal("ld")),
         f.trim(column("c")),
         f.upper(column("c")),
+        f.ends_with(column("a"), literal("llo")),
     )
     result = df.collect()
     assert len(result) == 1
@@ -573,6 +574,7 @@ def test_string_functions(df):
     assert result.column(25) == pa.array(["Helll", "Wldld", "!"])
     assert result.column(26) == pa.array(["hello", "world", "!"])
     assert result.column(27) == pa.array(["HELLO ", " WORLD ", " !"])
+    assert result.column(22) == pa.array([True, False, False])
 
 
 def test_hash_functions(df):

src/functions.rs

@@ -474,6 +474,7 @@ expr_fn!(
 );
 expr_fn!(sqrt, num);
 expr_fn!(starts_with, arg1 arg2, "Returns true if string starts with prefix.");
+expr_fn!(ends_with, arg1 arg2, "Returns true if string ends with suffix.");
 expr_fn!(strpos, string substring, "Returns starting index of specified substring within string, or zero if it's not present. (Same as position(substring in string), but note the reversed argument order.)");
 expr_fn!(substr, string position);
 expr_fn!(tan, num);