fix failing test

apache · Jan 23, 2025 · ec0ad23 · ec0ad23
1 parent 30b05b3
commit ec0ad23
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 8 deletions.
diff --git a/...yst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveDefaultStringTypes.scala b/...yst/src/main/scala/org/apache/spark/sql/catalyst/analysis/ResolveDefaultStringTypes.scala
@@ -156,11 +156,10 @@ object ResolveDefaultStringTypes extends Rule[LogicalPlan] {
     case expression if needsCast(expression) =>
       expression.setTagValue(CAST_ADDED_TAG, ())
       newType => {
-        val replacedType = replaceDefaultStringType(expression.dataType, newType)
-        if (newType == StringType || replacedType.sameType(newType)) {
+        if (newType == StringType) {
           expression
         } else {
-          Cast(expression, replacedType)
+          Cast(expression, replaceDefaultStringType(expression.dataType, newType))
         }
       }
   }

diff --git a/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/finishAnalysis.scala b/sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/optimizer/finishAnalysis.scala
@@ -33,7 +33,6 @@ import org.apache.spark.sql.catalyst.util.DateTimeUtils
 import org.apache.spark.sql.catalyst.util.DateTimeUtils.{convertSpecialDate, convertSpecialTimestamp, convertSpecialTimestampNTZ, instantToMicros, localDateTimeToMicros}
 import org.apache.spark.sql.catalyst.util.TypeUtils.toSQLExpr
 import org.apache.spark.sql.connector.catalog.CatalogManager
-import org.apache.spark.sql.internal.SQLConf
 import org.apache.spark.sql.types._
 
 
@@ -153,14 +152,15 @@ case class ReplaceCurrentLike(catalogManager: CatalogManager) extends Rule[Logic
     val currentCatalog = catalogManager.currentCatalog.name()
     val currentUser = CurrentUserContext.getCurrentUser
 
-    plan.transformAllExpressionsWithPruning(_.containsPattern(CURRENT_LIKE)) {
+    val res = plan.transformAllExpressionsWithPruning(_.containsPattern(CURRENT_LIKE)) {
       case CurrentDatabase() =>
-        Literal.create(currentNamespace, SQLConf.get.defaultStringType)
+        Literal.create(currentNamespace)
       case CurrentCatalog() =>
-        Literal.create(currentCatalog, SQLConf.get.defaultStringType)
+        Literal.create(currentCatalog)
       case CurrentUser() =>
-        Literal.create(currentUser, SQLConf.get.defaultStringType)
+        Literal.create(currentUser)
     }
+    res
   }
 }