fix test (new default collation)

Author: asl3

sql/core/src/main/scala/org/apache/spark/sql/execution/command/DescribeRelationJsonCommand.scala

@@ -99,6 +99,10 @@ case class DescribeRelationJsonCommand(
       case _ => throw QueryCompilationErrors.describeAsJsonNotSupportedForV2TablesError()
     }
 
+    // Add default collation if not yet added (addKeyValueToMap only adds unique keys).
+    // Add here to only affect `DESC AS JSON` and not the `DESC TABLE` output.
+    addKeyValueToMap("collation", JString("UTF8_BINARY"), jsonMap)
+
     Seq(Row(compact(render(JObject(jsonMap.toList)))))
   }
 
@@ -289,9 +293,6 @@ case class DescribeRelationJsonCommand(
     filteredTableInfo.map { case (key, value) =>
       addKeyValueToMap(key, value, jsonMap)
     }
-    // Add default collation if not yet added (addKeyValueToMap only adds unique keys).
-    // Add here to only affect `DESC AS JSON` and not the `DESC TABLE` output.
-    addKeyValueToMap("collation", JString("UTF8_BINARY"), jsonMap)
   }
 
   private def describePartitionInfoJson(

sql/core/src/test/scala/org/apache/spark/sql/execution/command/v1/DescribeTableSuite.scala

@@ -458,7 +458,7 @@ trait DescribeTableSuiteBase extends command.DescribeTableSuiteBase
           TableColumn("c1", Type("string", collation = Some("UNICODE_CI"))),
           TableColumn("c2", Type("string", collation = Some("UNICODE_RTRIM"))),
           TableColumn("c3", Type("string", collation = Some("fr"))),
-          TableColumn("c4", Type("string", collation = Some("UTF8_BINARY"))),
+          TableColumn("c4", Type("string", collation = Some("de"))),
           TableColumn("id", Type("int")))),
         last_access = Some("UNKNOWN"),
         created_by = Some(s"Spark $SPARK_VERSION"),