You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@spark.apache.org by ma...@apache.org on 2024/10/18 08:42:01 UTC
(spark) branch master updated: [SPARK-50016][SQL] Improve explicit collation mismatch error
This is an automated email from the ASF dual-hosted git repository.
maxgekk pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/spark.git
The following commit(s) were added to refs/heads/master by this push:
new 25c55a86c39f [SPARK-50016][SQL] Improve explicit collation mismatch error
25c55a86c39f is described below
commit 25c55a86c39fa6625ca71d24fa3c3aa1f5c9942f
Author: Uros Bojanic <ur...@databricks.com>
AuthorDate: Fri Oct 18 10:41:47 2024 +0200
[SPARK-50016][SQL] Improve explicit collation mismatch error
### What changes were proposed in this pull request?
Include the explicit string collations in the `COLLATION_MISMATCH.EXPLICIT` error message.
### Why are the changes needed?
Make the explicit collation mismatch error more user-friendly.
### Does this PR introduce _any_ user-facing change?
Yes, explicit collation mismatch error is changed.
### How was this patch tested?
Updated existing tests.
### Was this patch authored or co-authored using generative AI tooling?
No.
Closes #48525 from uros-db/explicit-collation-mismatch.
Authored-by: Uros Bojanic <ur...@databricks.com>
Signed-off-by: Max Gekk <ma...@gmail.com>
---
.../sql/catalyst/analysis/CollationTypeCasts.scala | 2 +-
.../spark/sql/errors/QueryCompilationErrors.scala | 4 +--
.../sql-tests/analyzer-results/collations.sql.out | 42 +++++++++++-----------
.../resources/sql-tests/results/collations.sql.out | 42 +++++++++++-----------
.../spark/sql/CollationSQLExpressionsSuite.scala | 4 ++-
.../apache/spark/sql/CollationSQLRegexpSuite.scala | 4 ++-
.../sql/CollationStringExpressionsSuite.scala | 4 ++-
.../org/apache/spark/sql/CollationSuite.scala | 14 ++++----
8 files changed, 61 insertions(+), 55 deletions(-)
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
index cfde8c9d8aa1..ee278180ce31 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/analysis/CollationTypeCasts.scala
@@ -175,7 +175,7 @@ object CollationTypeCasts extends TypeCoercionRule {
case size if size > 1 =>
throw QueryCompilationErrors
.explicitCollationMismatchError(
- explicitTypes.map(t => StringType(t).typeName)
+ explicitTypes.map(t => StringType(t))
)
// Only implicit or default collations present
case 0 =>
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
index 3dc906ed9828..717ce4253acf 100644
--- a/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
+++ b/sql/catalyst/src/main/scala/org/apache/spark/sql/errors/QueryCompilationErrors.scala
@@ -3658,11 +3658,11 @@ private[sql] object QueryCompilationErrors extends QueryErrorsBase with Compilat
)
}
- def explicitCollationMismatchError(explicitTypes: Seq[String]): Throwable = {
+ def explicitCollationMismatchError(explicitTypes: Seq[StringType]): Throwable = {
new AnalysisException(
errorClass = "COLLATION_MISMATCH.EXPLICIT",
messageParameters = Map(
- "explicitTypes" -> explicitTypes.map(toSQLId).mkString(", ")
+ "explicitTypes" -> explicitTypes.map(toSQLType).mkString(", ")
)
)
}
diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/collations.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/collations.sql.out
index 6a00d31f6431..739ef49627f2 100644
--- a/sql/core/src/test/resources/sql-tests/analyzer-results/collations.sql.out
+++ b/sql/core/src/test/resources/sql-tests/analyzer-results/collations.sql.out
@@ -426,7 +426,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -711,7 +711,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -769,7 +769,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -835,7 +835,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -925,7 +925,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1015,7 +1015,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1105,7 +1105,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1195,7 +1195,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1261,7 +1261,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1351,7 +1351,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -1433,7 +1433,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1523,7 +1523,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1813,7 +1813,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1975,7 +1975,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2153,7 +2153,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2219,7 +2219,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2285,7 +2285,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2375,7 +2375,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -2465,7 +2465,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2555,7 +2555,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -2645,7 +2645,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
diff --git a/sql/core/src/test/resources/sql-tests/results/collations.sql.out b/sql/core/src/test/resources/sql-tests/results/collations.sql.out
index fe77f88f2af4..e0c5e2d0a431 100644
--- a/sql/core/src/test/resources/sql-tests/results/collations.sql.out
+++ b/sql/core/src/test/resources/sql-tests/results/collations.sql.out
@@ -470,7 +470,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -786,7 +786,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -896,7 +896,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1026,7 +1026,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1170,7 +1170,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1326,7 +1326,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1482,7 +1482,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1638,7 +1638,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1768,7 +1768,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -1924,7 +1924,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -2060,7 +2060,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2216,7 +2216,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -2817,7 +2817,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -3140,7 +3140,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -3550,7 +3550,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -3680,7 +3680,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -3810,7 +3810,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -3954,7 +3954,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -4110,7 +4110,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string`, `string collate UTF8_LCASE`"
+ "explicitTypes" : "\"STRING\", \"STRING COLLATE UTF8_LCASE\""
}
}
@@ -4254,7 +4254,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
@@ -4398,7 +4398,7 @@ org.apache.spark.sql.AnalysisException
"errorClass" : "COLLATION_MISMATCH.EXPLICIT",
"sqlState" : "42P21",
"messageParameters" : {
- "explicitTypes" : "`string collate UTF8_LCASE`, `string`"
+ "explicitTypes" : "\"STRING COLLATE UTF8_LCASE\", \"STRING\""
}
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala
index d568cd77050f..daef9c772a65 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLExpressionsSuite.scala
@@ -1252,7 +1252,9 @@ class CollationSQLExpressionsSuite
sql("SELECT mask(collate('ab-CD-12-@$','UNICODE'),collate('X','UNICODE_CI'),'x','0','#')")
},
condition = "COLLATION_MISMATCH.EXPLICIT",
- parameters = Map("explicitTypes" -> "`string collate UNICODE`, `string collate UNICODE_CI`")
+ parameters = Map(
+ "explicitTypes" -> """"STRING COLLATE UNICODE", "STRING COLLATE UNICODE_CI""""
+ )
)
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLRegexpSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLRegexpSuite.scala
index 87dbbc65a393..5bb8511d0d93 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLRegexpSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationSQLRegexpSuite.scala
@@ -430,7 +430,9 @@ class CollationSQLRegexpSuite
sql(s"SELECT regexp_replace(collate('ABCDE','$c1'), '.c.', collate('FFF','$c2'))")
},
condition = "COLLATION_MISMATCH.EXPLICIT",
- parameters = Map("explicitTypes" -> "`string`, `string collate UTF8_LCASE`")
+ parameters = Map(
+ "explicitTypes" -> """"STRING", "STRING COLLATE UTF8_LCASE""""
+ )
)
// Unsupported collations
case class RegExpReplaceTestFail(l: String, r: String, c: String)
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
index 9407a0df1ed3..6db30a7ed0c6 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationStringExpressionsSuite.scala
@@ -177,7 +177,9 @@ class CollationStringExpressionsSuite
},
condition = "COLLATION_MISMATCH.EXPLICIT",
sqlState = "42P21",
- parameters = Map("explicitTypes" -> "`string`, `string collate UTF8_LCASE`")
+ parameters = Map(
+ "explicitTypes" -> """"STRING", "STRING COLLATE UTF8_LCASE""""
+ )
)
}
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
index f1b70959ce08..128d558d6735 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/CollationSuite.scala
@@ -337,7 +337,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
sqlState = "42P21",
parameters = Map(
"explicitTypes" ->
- s"`string collate $leftCollationName`, `string collate $rightCollationName`"
+ s""""STRING COLLATE $leftCollationName", "STRING COLLATE $rightCollationName""""
)
)
// startsWith
@@ -351,7 +351,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
sqlState = "42P21",
parameters = Map(
"explicitTypes" ->
- s"`string collate $leftCollationName`, `string collate $rightCollationName`"
+ s""""STRING COLLATE $leftCollationName", "STRING COLLATE $rightCollationName""""
)
)
// endsWith
@@ -365,7 +365,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
sqlState = "42P21",
parameters = Map(
"explicitTypes" ->
- s"`string collate $leftCollationName`, `string collate $rightCollationName`"
+ s""""STRING COLLATE $leftCollationName", "STRING COLLATE $rightCollationName""""
)
)
}
@@ -605,7 +605,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
},
condition = "COLLATION_MISMATCH.EXPLICIT",
parameters = Map(
- "explicitTypes" -> "`string`, `string collate UNICODE`"
+ "explicitTypes" -> """"STRING", "STRING COLLATE UNICODE""""
)
)
@@ -617,7 +617,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
},
condition = "COLLATION_MISMATCH.EXPLICIT",
parameters = Map(
- "explicitTypes" -> "`string`, `string collate UNICODE`"
+ "explicitTypes" -> """"STRING", "STRING COLLATE UNICODE""""
)
)
checkError(
@@ -627,7 +627,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
},
condition = "COLLATION_MISMATCH.EXPLICIT",
parameters = Map(
- "explicitTypes" -> "`string collate UNICODE`, `string`"
+ "explicitTypes" -> """"STRING COLLATE UNICODE", "STRING""""
)
)
@@ -715,7 +715,7 @@ class CollationSuite extends DatasourceV2SQLBase with AdaptiveSparkPlanHelper {
sqlState = "42P21",
parameters = Map(
"explicitTypes" ->
- s"`string collate UTF8_LCASE`, `string collate UNICODE`"
+ s""""STRING COLLATE UTF8_LCASE", "STRING COLLATE UNICODE""""
)
)
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@spark.apache.org
For additional commands, e-mail: commits-help@spark.apache.org