Skip to content

[SPARK-53676][PYTHON] Extend to support column name #52420

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[SPARK-53676][PYTHON] Extend to support column name #52420

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 4 additions & 2 deletions python/pyspark/sql/classic/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1638,8 +1638,10 @@ def withColumns(self, *colsMap: Dict[str, Column]) -> ParentDataFrame:
self.sparkSession,
)

def withColumn(self, colName: str, col: Column) -> ParentDataFrame:
if not isinstance(col, Column):
def withColumn(self, colName: str, col: "ColumnOrName") -> ParentDataFrame:
if isinstance(col, str):
col = F.col(col)
elif not isinstance(col, Column):
raise PySparkTypeError(
errorClass="NOT_COLUMN",
messageParameters={"arg_name": "col", "arg_type": type(col).__name__},
Expand Down
6 changes: 4 additions & 2 deletions python/pyspark/sql/connect/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -932,8 +932,10 @@ def withColumns(self, *colsMap: Dict[str, Column]) -> ParentDataFrame:
session=self._session,
)

def withColumn(self, colName: str, col: Column) -> ParentDataFrame:
if not isinstance(col, Column):
def withColumn(self, colName: str, col: "ColumnOrName") -> ParentDataFrame:
if isinstance(col, str):
col = F.col(col)
elif not isinstance(col, Column):
raise PySparkTypeError(
errorClass="NOT_COLUMN",
messageParameters={"arg_name": "col", "arg_type": type(col).__name__},
Expand Down
6 changes: 3 additions & 3 deletions python/pyspark/sql/dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5651,7 +5651,7 @@ def withColumns(self, *colsMap: Dict[str, Column]) -> "DataFrame":
...

@dispatch_df_method
def withColumn(self, colName: str, col: Column) -> "DataFrame":
def withColumn(self, colName: str, col: "ColumnOrName") -> "DataFrame":
"""
Returns a new :class:`DataFrame` by adding a column or replacing the
existing column that has the same name.
Expand All @@ -5668,8 +5668,8 @@ def withColumn(self, colName: str, col: Column) -> "DataFrame":
----------
colName : str
string, name of the new column.
col : :class:`Column`
a :class:`Column` expression for the new column.
cols: str or :class:`Column`
A name of a column, or a :class:`Column` expression for the new column.

Returns
-------
Expand Down
4 changes: 4 additions & 0 deletions python/pyspark/sql/tests/test_dataframe.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -413,6 +413,10 @@ def test_with_column_with_existing_name(self):
keys = self.df.withColumn("key", self.df.key).select("key").collect()
self.assertEqual([r.key for r in keys], list(range(100)))

def test_with_column_with_column_name(self):
keys = self.df.withColumn("key", "key").select("key").collect()
self.assertEqual([r.key for r in keys], list(range(100)))

# regression test for SPARK-10417
def test_column_iterator(self):
def foo():
Expand Down