fix: update error message to include both alias forms for column and literal helpers

Author: kosiew

python/datafusion/expr.py

@@ -41,7 +41,8 @@
 
 
 # Standard error message for invalid expression types
-EXPR_TYPE_ERROR = "Use col() or lit() to construct expressions"
+# Mention both alias forms of column and literal helpers
+EXPR_TYPE_ERROR = "Use col()/column() or lit()/literal() to construct expressions"
 
 # The following are imported from the internal representation. We may choose to
 # give these all proper wrappers, or to simply leave as is. These were added

python/tests/test_dataframe.py

@@ -376,7 +376,9 @@ def test_with_column(df):
 
 
 def test_with_column_invalid_expr(df):
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(
+        TypeError, match=r"Use col\(\)/column\(\) or lit\(\)/literal\(\)"
+    ):
         df.with_column("c", "a")
 
 
@@ -412,9 +414,13 @@ def test_with_columns(df):
 
 
 def test_with_columns_invalid_expr(df):
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(
+        TypeError, match=r"Use col\(\)/column\(\) or lit\(\)/literal\(\)"
+    ):
         df.with_columns("a")
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(
+        TypeError, match=r"Use col\(\)/column\(\) or lit\(\)/literal\(\)"
+    ):
         df.with_columns(c="a")
 
 
@@ -586,12 +592,16 @@ def test_join_on_invalid_expr():
     df = ctx.create_dataframe([[batch]], "l")
     df1 = ctx.create_dataframe([[batch]], "r")
 
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(
+        TypeError, match=r"Use col\(\)/column\(\) or lit\(\)/literal\(\)"
+    ):
         df.join_on(df1, "a")
 
 
 def test_aggregate_invalid_aggs(df):
-    with pytest.raises(TypeError, match=r"Use col\(\) or lit\(\)"):
+    with pytest.raises(
+        TypeError, match=r"Use col\(\)/column\(\) or lit\(\)/literal\(\)"
+    ):
         df.aggregate([], "a")