fix test

apache · Nov 25, 2024 · 256a5b5 · 256a5b5
1 parent fb91c15
commit 256a5b5
Show file tree

Hide file tree

Showing 8 changed files with 18 additions and 14 deletions.
diff --git a/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4 b/sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4
@@ -1030,10 +1030,10 @@ namedExpression
     ;
 
 namedExpressionSeq
-    : namedExpression
-        {optional_trailing_comma_in_named_expression_lists}? (COMMA namedExpression)* COMMA?
-    | namedExpression
-        {!optional_trailing_comma_in_named_expression_lists}? (COMMA namedExpression)*
+    : {optional_trailing_comma_in_named_expression_lists}?
+        namedExpression (COMMA namedExpression)* COMMA?
+    | {!optional_trailing_comma_in_named_expression_lists}?
+        namedExpression (COMMA namedExpression)*
     ;
 
 partitionFieldList

diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/PlanParserSuite.scala
@@ -501,7 +501,7 @@ class PlanParserSuite extends AnalysisTest {
     checkError(
       exception = parseException(sql1),
       condition = "PARSE_SYNTAX_ERROR",
-      parameters = Map("error" -> "'b'", "hint" -> ": extra input 'b'"))
+      parameters = Map("error" -> "'b'", "hint" -> ""))
   }
 
   test("limit") {
@@ -1978,12 +1978,14 @@ class PlanParserSuite extends AnalysisTest {
   test("SPARK-50418: Support an optional trailing comma at the end of SELECT lists") {
     withSQLConf(SQLConf.OPTIONAL_TRAILING_COMMA_IN_NAMED_EXPRESSION_LISTS.key -> "true") {
       assertEqual("select 1, ", OneRowRelation().select(1))
+      assertEqual("select 1, 2", OneRowRelation().select(1, 2))
     }
     withSQLConf(SQLConf.OPTIONAL_TRAILING_COMMA_IN_NAMED_EXPRESSION_LISTS.key -> "false") {
+      assertEqual("select 1, 2", OneRowRelation().select(1, 2))
       checkError(
         exception = parseException("select 1,"),
         condition = "PARSE_SYNTAX_ERROR",
-        parameters = Map("error" -> "','", "hint" -> ""))
+        parameters = Map("error" -> "'1'", "hint" -> ""))
     }
   }
 }
diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/postgreSQL/window_part3.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/postgreSQL/window_part3.sql.out
@@ -400,7 +400,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "sqlState" : "42601",
   "messageParameters" : {
     "error" : "'BY'",
-    "hint" : ": extra input 'BY'"
+    "hint" : ""
   }
 }
 

diff --git a/sql/core/src/test/resources/sql-tests/analyzer-results/sql-session-variables.sql.out b/sql/core/src/test/resources/sql-tests/analyzer-results/sql-session-variables.sql.out
@@ -2018,7 +2018,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'('",
+    "error" : "'c1'",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/resources/sql-tests/results/postgreSQL/window_part3.sql.out b/sql/core/src/test/resources/sql-tests/results/postgreSQL/window_part3.sql.out
@@ -425,7 +425,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "sqlState" : "42601",
   "messageParameters" : {
     "error" : "'BY'",
-    "hint" : ": extra input 'BY'"
+    "hint" : ""
   }
 }
 

diff --git a/sql/core/src/test/resources/sql-tests/results/sql-session-variables.sql.out b/sql/core/src/test/resources/sql-tests/results/sql-session-variables.sql.out
@@ -2189,7 +2189,7 @@ org.apache.spark.sql.catalyst.parser.ParseException
   "errorClass" : "PARSE_SYNTAX_ERROR",
   "sqlState" : "42601",
   "messageParameters" : {
-    "error" : "'('",
+    "error" : "'c1'",
     "hint" : ""
   }
 }

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryCompilationErrorsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryCompilationErrorsSuite.scala
@@ -1029,8 +1029,10 @@ class QueryCompilationErrorsSuite
         sql(s"SELECT from from FROM from from")
         sql(s"SELECT c1, from FROM VALUES(1, 2) AS T(c1, from)")
 
-        intercept[ParseException] {
-          sql("SELECT 1,")
+        withSQLConf(SQLConf.OPTIONAL_TRAILING_COMMA_IN_NAMED_EXPRESSION_LISTS.key -> "false") {
+          intercept[ParseException] {
+            sql("SELECT 1,")
+          }
         }
       }
     }

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/errors/QueryParsingErrorsSuite.scala
@@ -680,7 +680,7 @@ class QueryParsingErrorsSuite extends QueryTest with SharedSparkSession with SQL
       exception = parseException("SELECT CAST(struct(1,2,3) AS STRUCT<INT>)"),
       condition = "PARSE_SYNTAX_ERROR",
       sqlState = "42601",
-      parameters = Map("error" -> "'<'", "hint" -> ": missing ')'"))
+      parameters = Map("error" -> "'>'", "hint" -> ""))
     // Create column of struct type without specifying field type in lowercase
     checkError(
       exception = parseException("CREATE TABLE tbl_120691 (col1 struct)"),
@@ -707,7 +707,7 @@ class QueryParsingErrorsSuite extends QueryTest with SharedSparkSession with SQL
       exception = parseException("SELECT CAST(map('1',2) AS MAP<STRING>)"),
       condition = "PARSE_SYNTAX_ERROR",
       sqlState = "42601",
-      parameters = Map("error" -> "'<'", "hint" -> ": missing ')'"))
+      parameters = Map("error" -> "'>'", "hint" -> ""))
     // Create column of map type without specifying key/value types in lowercase
     checkError(
       exception = parseException("SELECT CAST(map('1',2) AS map)"),