Remove usage of toSQLId which broke a ton of tests

scottsand-db · Mar 26, 2024 · a993606 · a993606
1 parent ddcccf4
commit a993606
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 8 deletions.
diff --git a/spark/src/main/scala/org/apache/spark/sql/delta/DeltaErrors.scala b/spark/src/main/scala/org/apache/spark/sql/delta/DeltaErrors.scala
@@ -2077,7 +2077,7 @@ trait DeltaErrorsBase
       constraints: Map[String, String]): Throwable = {
     new DeltaAnalysisException(
       errorClass = "_LEGACY_ERROR_TEMP_DELTA_0004",
-      messageParameters = Array(operation, toSQLId(columnName), constraints.mkString("\n"))
+      messageParameters = Array(operation, columnName, constraints.mkString("\n"))
     )
   }
 
@@ -2087,7 +2087,7 @@ trait DeltaErrorsBase
       fields: Seq[StructField]): Throwable = {
     new DeltaAnalysisException(
       errorClass = "_LEGACY_ERROR_TEMP_DELTA_0005",
-      messageParameters = Array(operation, toSQLId(columnName), fields.map(_.name).mkString("\n"))
+      messageParameters = Array(operation, columnName, fields.map(_.name).mkString("\n"))
     )
   }
 
@@ -2415,7 +2415,7 @@ trait DeltaErrorsBase
       hasInsert: Boolean): Throwable = {
     new DeltaAnalysisException(
       errorClass = "_LEGACY_ERROR_TEMP_DELTA_0006",
-      messageParameters = Array(toSQLId(colName), s"$hasStart", s"$hasStep", s"$hasInsert")
+      messageParameters = Array(colName, s"$hasStart", s"$hasStep", s"$hasInsert")
     )
   }
 
@@ -3270,7 +3270,7 @@ trait DeltaErrorsBase
   def mergeAddVoidColumn(columnName: String): Throwable = {
     new DeltaAnalysisException(
       errorClass = "DELTA_MERGE_ADD_VOID_COLUMN",
-      messageParameters = Array(toSQLId(columnName))
+      messageParameters = Array(columnName)
     )
   }
 }

diff --git a/spark/src/test/scala/org/apache/spark/sql/delta/DeltaErrorsSuite.scala b/spark/src/test/scala/org/apache/spark/sql/delta/DeltaErrorsSuite.scala
@@ -2908,7 +2908,7 @@ trait DeltaErrorsSuiteBase
         Some("_LEGACY_ERROR_TEMP_DELTA_0004"),
         None,
         Some(
-          s"""Cannot UPDATE column `col1` because this column is referenced by the following
+          s"""Cannot UPDATE column col1 because this column is referenced by the following
              |check constraint(s):
              |foo -> bar""".stripMargin)
       )
@@ -2923,7 +2923,7 @@ trait DeltaErrorsSuiteBase
         Some("_LEGACY_ERROR_TEMP_DELTA_0005"),
         None,
         Some(
-          s"""Cannot UPDATE column `col1` because this column is referenced by the following
+          s"""Cannot UPDATE column col1 because this column is referenced by the following
              |generated column(s):
              |col2""".stripMargin)
       )
@@ -2936,7 +2936,7 @@ trait DeltaErrorsSuiteBase
         e,
         Some("_LEGACY_ERROR_TEMP_DELTA_0006"),
         None,
-        Some(s"Inconsistent IDENTITY metadata for column `col1` detected: true, true, true")
+        Some(s"Inconsistent IDENTITY metadata for column col1 detected: true, true, true")
       )
     }
     {
@@ -2957,7 +2957,7 @@ trait DeltaErrorsSuiteBase
         e,
         Some("DELTA_MERGE_ADD_VOID_COLUMN"),
         Some("42K09"),
-        Some(s"Cannot add column `fooCol` with type VOID. Please explicitly specify a non-void type.")
+        Some(s"Cannot add column fooCol with type VOID. Please explicitly specify a non-void type.")
       )
     }
   }