Skip to content
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

Jump to bottom

[SPARK-48413][SQL][FOLLOW-UP] Fix ALTER COLUMN with collation #48582

Open
wants to merge 4 commits into
base: master
Choose a base branch
from
+26 −1
Open

[SPARK-48413][SQL][FOLLOW-UP] Fix ALTER COLUMN with collation #48582

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9df8032
Fix ALTER COLUMN with collation
jovanm-db Oct 21, 2024
c7c4d7d
Fix errors
jovanm-db Oct 21, 2024
01a497f
Fix test
jovanm-db Oct 22, 2024
9e2abae
Improve test
jovanm-db Oct 22, 2024
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
5 changes: 4 additions & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CheckAnalysis.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1546,7 +1546,10 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog with QueryErrorsB
.map(dt => col.field.copy(dataType = dt))
.getOrElse(col.field)
val newDataType = a.dataType.get
val sameTypeExceptCollations =
DataType.equalsIgnoreCompatibleCollation(field.dataType, newDataType)
newDataType match {
case _ if sameTypeExceptCollations =>
jovanm-db marked this conversation as resolved.
Show resolved Hide resolved
case _: StructType => alter.failAnalysis(
"CANNOT_UPDATE_FIELD.STRUCT_TYPE",
Map("table" -> toSQLId(table.name), "fieldName" -> toSQLId(fieldName)))
Expand Down Expand Up @@ -1576,7 +1579,7 @@ trait CheckAnalysis extends PredicateHelper with LookupCatalog with QueryErrorsB
case _ => Cast.canUpCast(from, to)
}

if (!canAlterColumnType(field.dataType, newDataType)) {
if (!sameTypeExceptCollations && !canAlterColumnType(field.dataType, newDataType)) {
alter.failAnalysis(
errorClass = "NOT_SUPPORTED_CHANGE_COLUMN",
messageParameters = Map(
Expand Down
8 changes: 8 additions & 0 deletions sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -516,6 +516,14 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
}
}

test("SPARK-48413: Alter column with collation") {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

can we also add tests for complex types (struct, map, array)?

val tableName = "testcat.alter_column_tbl"
withTable(tableName) {
sql(s"CREATE TABLE $tableName (c1 STRING) USING PARQUET")
sql(s"ALTER TABLE $tableName ALTER COLUMN c1 TYPE STRING COLLATE UTF8_LCASE")
}
jovanm-db marked this conversation as resolved.
Show resolved Hide resolved
}

test("SPARK-47210: Implicit casting of collated strings") {
val tableName = "parquet_dummy_implicit_cast_t22"
withTable(tableName) {
Expand Down