[SPARK-50069][SQL] Integrate _LEGACY_ERROR_TEMP_0028 into UNSUPPORTED_FROM_TO_EXPRESSION

common/utils/src/main/resources/error/error-conditions.json

@@ -5713,11 +5713,6 @@
       "The value of from-to unit must be a string."
     ]
   },
-  "_LEGACY_ERROR_TEMP_0028" : {
-    "message" : [
-      "Intervals FROM <from> TO <to> are not supported."
-    ]
-  },
   "_LEGACY_ERROR_TEMP_0029" : {
     "message" : [
       "Cannot mix year-month and day-time fields: <literal>."

sql/api/src/main/scala/org/apache/spark/sql/catalyst/parser/DataTypeAstBuilder.scala

@@ -111,7 +111,14 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
       val endStr = ctx.to.getText.toLowerCase(Locale.ROOT)
       val end = YearMonthIntervalType.stringToField(endStr)
       if (end <= start) {
-        throw QueryParsingErrors.fromToIntervalUnsupportedError(startStr, endStr, ctx)
+        val intervalInput = ctx.getText()
+        val pattern = "'([^']*)'".r
+
+        val input = pattern.findFirstMatchIn(intervalInput) match {
+          case Some(m) => m.group(1)
+          case None => ""
+        }
+        throw QueryParsingErrors.fromToIntervalUnsupportedError(input, startStr, endStr, ctx)
       }
       YearMonthIntervalType(start, end)
     } else {
@@ -126,7 +133,14 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
       val endStr = ctx.to.getText.toLowerCase(Locale.ROOT)
       val end = DayTimeIntervalType.stringToField(endStr)
       if (end <= start) {
-        throw QueryParsingErrors.fromToIntervalUnsupportedError(startStr, endStr, ctx)
+        val intervalInput = ctx.getText()
+        val pattern = "'([^']*)'".r
+
+        val input = pattern.findFirstMatchIn(intervalInput) match {
+          case Some(m) => m.group(1)
+          case None => ""
+        }
+        throw QueryParsingErrors.fromToIntervalUnsupportedError(input, startStr, endStr, ctx)
       }
       DayTimeIntervalType(start, end)
     } else {

sql/api/src/main/scala/org/apache/spark/sql/errors/QueryParsingErrors.scala

@@ -281,12 +281,13 @@ private[sql] object QueryParsingErrors extends DataTypeErrorsBase {
   }
 
   def fromToIntervalUnsupportedError(
+      input: String,
       from: String,
       to: String,
       ctx: ParserRuleContext): Throwable = {
     new ParseException(
-      errorClass = "_LEGACY_ERROR_TEMP_0028",
-      messageParameters = Map("from" -> from, "to" -> to),
+      errorClass = "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+      messageParameters = Map("input" -> input, "from" -> from, "to" -> to),
       ctx)
   }
 

sql/catalyst/src/main/scala/org/apache/spark/sql/catalyst/parser/AstBuilder.scala

@@ -3570,7 +3570,14 @@ class AstBuilder extends DataTypeAstBuilder
             IntervalUtils.fromDayTimeString(value,
               DayTimeIntervalType.stringToField(from), DayTimeIntervalType.stringToField(to))
           case _ =>
-            throw QueryParsingErrors.fromToIntervalUnsupportedError(from, to, ctx)
+            val intervalInput = ctx.getText()
+            val pattern = "'([^']*)'".r
+
+            val input = pattern.findFirstMatchIn(intervalInput) match {
+              case Some(m) => m.group(1)
+              case None => ""
+            }
+            throw QueryParsingErrors.fromToIntervalUnsupportedError(input, from, to, ctx)
         }
       } catch {
         // Keep error class of SparkIllegalArgumentExceptions and enrich it with query context

sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/ExpressionParserSuite.scala

@@ -1082,8 +1082,8 @@ class ExpressionParserSuite extends AnalysisTest {
     // Unknown FROM TO intervals
     checkError(
       exception = parseException("interval '10' month to second"),
-      condition = "_LEGACY_ERROR_TEMP_0028",
-      parameters = Map("from" -> "month", "to" -> "second"),
+      condition = "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+      parameters = Map("input" -> "10", "from" -> "month", "to" -> "second"),
       context = ExpectedContext(
         fragment = "'10' month to second",
         start = 9,

sql/core/src/test/resources/sql-tests/analyzer-results/ansi/interval.sql.out

@@ -1233,9 +1233,11 @@ select interval '1' year to second
 -- !query analysis
 org.apache.spark.sql.catalyst.parser.ParseException
 {
-  "errorClass" : "_LEGACY_ERROR_TEMP_0028",
+  "errorClass" : "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+  "sqlState" : "22006",
   "messageParameters" : {
     "from" : "year",
+    "input" : "1",
     "to" : "second"
   },
   "queryContext" : [ {

sql/core/src/test/resources/sql-tests/analyzer-results/interval.sql.out

@@ -1233,9 +1233,11 @@ select interval '1' year to second
 -- !query analysis
 org.apache.spark.sql.catalyst.parser.ParseException
 {
-  "errorClass" : "_LEGACY_ERROR_TEMP_0028",
+  "errorClass" : "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+  "sqlState" : "22006",
   "messageParameters" : {
     "from" : "year",
+    "input" : "1",
     "to" : "second"
   },
   "queryContext" : [ {

sql/core/src/test/resources/sql-tests/results/ansi/interval.sql.out

@@ -1535,9 +1535,11 @@ struct<>
 -- !query output
 org.apache.spark.sql.catalyst.parser.ParseException
 {
-  "errorClass" : "_LEGACY_ERROR_TEMP_0028",
+  "errorClass" : "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+  "sqlState" : "22006",
   "messageParameters" : {
     "from" : "year",
+    "input" : "1",
     "to" : "second"
   },
   "queryContext" : [ {

sql/core/src/test/resources/sql-tests/results/interval.sql.out

@@ -1422,9 +1422,11 @@ struct<>
 -- !query output
 org.apache.spark.sql.catalyst.parser.ParseException
 {
-  "errorClass" : "_LEGACY_ERROR_TEMP_0028",
+  "errorClass" : "INVALID_INTERVAL_FORMAT.UNSUPPORTED_FROM_TO_EXPRESSION",
+  "sqlState" : "22006",
   "messageParameters" : {
     "from" : "year",
+    "input" : "1",
     "to" : "second"
   },
   "queryContext" : [ {