fix

apache · Jan 30, 2025 · 7d25a4c · 7d25a4c
1 parent 7243de6
commit 7d25a4c
Show file tree

Hide file tree

Showing 5 changed files with 31 additions and 33 deletions.
diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/package.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/util/package.scala
@@ -95,6 +95,9 @@ package object util extends Logging {
   // generated column names don't contain back-ticks or double-quotes.
   def usePrettyExpression(e: Expression): Expression = e transform {
     case a: Attribute => new PrettyAttribute(a)
+    case Literal(s: UTF8String, collationStringType: StringType)
+        if collationStringType.collationId != 0 =>
+      PrettyAttribute(s.toString, StringType)
     case Literal(s: UTF8String, StringType) => PrettyAttribute(s.toString, StringType)
     case Literal(v, t: NumericType) if v != null => PrettyAttribute(v.toString, t)
     case Literal(null, dataType) => PrettyAttribute("NULL", dataType)

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
@@ -442,7 +442,7 @@ Project [array_except(array(collate(aaa, utf8_lcase)), array(collate(AAA, utf8_l
 -- !query
 select 'a' collate unicode < 'A'
 -- !query analysis
-Project [(collate(a, unicode) < A) AS (collate(a, unicode) < 'A' collate UNICODE)#x]
+Project [(collate(a, unicode) < A) AS (collate(a, unicode) < A)#x]
 +- OneRowRelation
 
 

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
@@ -479,7 +479,7 @@ struct<array_except(array(collate(aaa, utf8_lcase)), array(collate(AAA, utf8_lca
 -- !query
 select 'a' collate unicode < 'A'
 -- !query schema
-struct<(collate(a, unicode) < 'A' collate UNICODE):boolean>
+struct<(collate(a, unicode) < A):boolean>
 -- !query output
 true
 

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
@@ -1209,10 +1209,9 @@ class CollationSQLExpressionsSuite
           condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
           sqlState = Some("42K09"),
           parameters = Map(
-            "sqlExpr" -> ("\"str_to_map('a:1,b:2,c:3' collate " + s"${t.collation}, " +
-              "'?' collate " + s"${t.collation}, '?' collate ${t.collation})" + "\""),
+            "sqlExpr" -> "\"str_to_map(a:1,b:2,c:3, ?, ?)\"",
             "paramIndex" -> "first",
-            "inputSql" -> ("\"'a:1,b:2,c:3' collate " + s"${t.collation}" + "\""),
+            "inputSql" -> "\"a:1,b:2,c:3\"",
             "inputType" -> ("\"STRING COLLATE " + s"${t.collation}" + "\""),
             "requiredType" -> "\"STRING\""),
           context = ExpectedContext(

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
@@ -142,9 +142,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"split_part('1a2' collate UNICODE_AI, 'a' collate UNICODE_AI, 2)\"",
+          "sqlExpr" -> "\"split_part(1a2, a, 2)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'1a2' collate UNICODE_AI\"",
+          "inputSql" -> "\"1a2\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "split_part('1a2', 'a', 2)", start = 7, stop = 31)
@@ -238,9 +238,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"contains('abcde' collate UNICODE_AI, 'A' collate UNICODE_AI)\"",
+          "sqlExpr" -> "\"contains(abcde, A)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'abcde' collate UNICODE_AI\"",
+          "inputSql" -> "\"abcde\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "contains('abcde', 'A')", start = 7, stop = 28)
@@ -295,10 +295,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> ("\"substring_index('abacde' collate UNICODE_AI, " +
-            "'a' collate UNICODE_AI, 2)\""),
+          "sqlExpr" -> ("\"substring_index(abacde, a, 2)\""),
           "paramIndex" -> "first",
-          "inputSql" -> "\"'abacde' collate UNICODE_AI\"",
+          "inputSql" -> "\"abacde\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(
@@ -347,9 +346,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"instr('a' collate UNICODE_AI, 'abcde' collate UNICODE_AI)\"",
+          "sqlExpr" -> "\"instr(a, abcde)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'a' collate UNICODE_AI\"",
+          "inputSql" -> "\"a\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "instr('a', 'abcde')", start = 7, stop = 25)
@@ -426,9 +425,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"startswith('abcde' collate UNICODE_AI, 'A' collate UNICODE_AI)\"",
+          "sqlExpr" -> "\"startswith(abcde, A)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'abcde' collate UNICODE_AI\"",
+          "inputSql" -> "\"abcde\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "startswith('abcde', 'A')", start = 7, stop = 30)
@@ -481,10 +480,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> ("\"translate('ABC' collate UNICODE_AI, 'AB' collate UNICODE_AI, " +
-            "'12' collate UNICODE_AI)\""),
+          "sqlExpr" -> "\"translate(ABC, AB, 12)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'ABC' collate UNICODE_AI\"",
+          "inputSql" -> "\"ABC\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "translate('ABC', 'AB', '12')", start = 7, stop = 34)
@@ -538,10 +536,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> ("\"replace('abcde' collate UNICODE_AI, 'A' collate UNICODE_AI, " +
-            "'B' collate UNICODE_AI)\""),
+          "sqlExpr" -> "\"replace(abcde, A, B)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'abcde' collate UNICODE_AI\"",
+          "inputSql" -> "\"abcde\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "replace('abcde', 'A', 'B')", start = 7, stop = 32)
@@ -591,9 +588,9 @@ class CollationStringExpressionsSuite
           condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
           sqlState = Some("42K09"),
           parameters = Map(
-            "sqlExpr" -> "\"endswith('abcde' collate UNICODE_AI, 'A' collate UNICODE_AI)\"",
+            "sqlExpr" -> "\"endswith(abcde, A)\"",
             "paramIndex" -> "first",
-            "inputSql" -> "\"'abcde' collate UNICODE_AI\"",
+            "inputSql" -> "\"abcde\"",
             "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
             "requiredType" -> "\"STRING\""),
           context = ExpectedContext(fragment = "endswith('abcde', 'A')", start = 7, stop = 28)
@@ -1530,9 +1527,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"locate('aa' collate UNICODE_AI, 'Aaads' collate UNICODE_AI, 0)\"",
+          "sqlExpr" -> "\"locate(aa, Aaads, 0)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'aa' collate UNICODE_AI\"",
+          "inputSql" -> "\"aa\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "locate('aa', 'Aaads', 0)", start = 7, stop = 30)
@@ -1590,9 +1587,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"TRIM(LEADING 'x' collate UNICODE_AI FROM 'xxasdxx' collate UNICODE_AI)\"",
+          "sqlExpr" -> "\"TRIM(LEADING x FROM xxasdxx)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'xxasdxx' collate UNICODE_AI\"",
+          "inputSql" -> "\"xxasdxx\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "ltrim('x', 'xxasdxx')", start = 7, stop = 27)
@@ -1652,10 +1649,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> ("\"TRIM(TRAILING 'x' collate UNICODE_AI FROM 'xxasdxx'" +
-            " collate UNICODE_AI)\""),
+          "sqlExpr" -> "\"TRIM(TRAILING x UNICODE_AI FROM xxasdxx)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'xxasdxx' collate UNICODE_AI\"",
+          "inputSql" -> "\"xxasdxx\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "rtrim('x', 'xxasdxx')", start = 7, stop = 27)
@@ -1716,9 +1712,9 @@ class CollationStringExpressionsSuite
         condition = "DATATYPE_MISMATCH.UNEXPECTED_INPUT_TYPE",
         sqlState = Some("42K09"),
         parameters = Map(
-          "sqlExpr" -> "\"TRIM(BOTH 'x' collate UNICODE_AI FROM 'xxasdxx' collate UNICODE_AI)\"",
+          "sqlExpr" -> "\"TRIM(BOTH x FROM xxasdxx)\"",
           "paramIndex" -> "first",
-          "inputSql" -> "\"'xxasdxx' collate UNICODE_AI\"",
+          "inputSql" -> "\"xxasdxx\"",
           "inputType" -> "\"STRING COLLATE UNICODE_AI\"",
           "requiredType" -> "\"STRING\""),
         context = ExpectedContext(fragment = "trim('x', 'xxasdxx')", start = 7, stop = 26)