revert branch UNPICK

Author: kosiew

docs/source/user-guide/dataframe/index.rst

@@ -126,44 +126,6 @@ DataFusion's DataFrame API offers a wide range of operations:
     # Drop columns
     df = df.drop("temporary_column")
 
-String Columns and Expressions
-------------------------------
-
-Some ``DataFrame`` methods accept plain strings when an argument refers to an
-existing column. These include:
-
-* :py:meth:`~datafusion.DataFrame.select`
-* :py:meth:`~datafusion.DataFrame.sort`
-* :py:meth:`~datafusion.DataFrame.drop`
-* :py:meth:`~datafusion.DataFrame.join` (``on`` argument)
-* :py:meth:`~datafusion.DataFrame.aggregate` (grouping columns)
-
-For such methods, you can pass column names directly:
-
-.. code-block:: python
-
-    df.sort('id')
-
-The same operation can also be written with an explicit column expression:
-
-.. code-block:: python
-
-    from datafusion import col
-    df.sort(col('id'))
-
-Whenever an argument represents an expression—such as in
-:py:meth:`~datafusion.DataFrame.filter` or
-:py:meth:`~datafusion.DataFrame.with_column`—use ``col()`` to reference columns
-and wrap constant values with ``lit()`` (also available as ``literal()``):
-
-.. code-block:: python
-
-    from datafusion import col, lit
-    df.filter(col('age') > lit(21))
-
-Without ``lit()`` DataFusion would treat ``21`` as a column name rather than a
-constant value.
-
 Terminal Operations
 -------------------
 

python/datafusion/dataframe.py

@@ -521,22 +521,19 @@ def aggregate(
         aggs = [e.expr for e in aggs]
         return DataFrame(self.df.aggregate(group_by, aggs))
 
-    def sort(self, *exprs: Expr | SortExpr | str) -> DataFrame:
-        """Sort the DataFrame by the specified sorting expressions or column names.
+    def sort(self, *exprs: Expr | SortExpr) -> DataFrame:
+        """Sort the DataFrame by the specified sorting expressions.
 
         Note that any expression can be turned into a sort expression by
-        calling its ``sort`` method.
+        calling its` ``sort`` method.
 
         Args:
-            exprs: Sort expressions or column names, applied in order.
+            exprs: Sort expressions, applied in order.
 
         Returns:
             DataFrame after sorting.
         """
-        exprs_raw = []
-        for expr in exprs:
-            expr_obj = Expr.column(expr).sort() if isinstance(expr, str) else expr
-            exprs_raw.append(sort_or_default(expr_obj))
+        exprs_raw = [sort_or_default(expr) for expr in exprs]
         return DataFrame(self.df.sort(*exprs_raw))
 
     def cast(self, mapping: dict[str, pa.DataType[Any]]) -> DataFrame:

python/tests/test_dataframe.py

@@ -268,19 +268,6 @@ def test_sort(df):
     assert table.to_pydict() == expected
 
 
-def test_sort_string_and_expression_equivalent(df):
-    from datafusion import col
-
-    result_str = df.sort("a").to_pydict()
-    result_expr = df.sort(col("a")).to_pydict()
-    assert result_str == result_expr
-
-
-def test_filter_string_unsupported(df):
-    with pytest.raises(AttributeError):
-        df.filter("a > 1")
-
-
 def test_drop(df):
     df = df.drop("c")