fix merge

imback82 · imback82 · commit 72b330756f9d · 2020-01-16T15:44:17.000-08:00
diff --git a/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala b/sql/catalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/DDLParserSuite.scala
@@ -790,6 +790,7 @@ class DDLParserSuite extends AnalysisTest {
   }
 
   test("SPARK-17328 Fix NPE with EXPLAIN DESCRIBE TABLE") {
+    comparePlans(parsePlan("describe t"),
       DescribeRelation(UnresolvedTableOrView(Seq("t")), Map.empty, isExtended = false))
     comparePlans(parsePlan("describe table t"),
       DescribeRelation(UnresolvedTableOrView(Seq("t")), Map.empty, isExtended = false))

Original file line number	Diff line number	Diff line change
`@@ -790,6 +790,7 @@ class DDLParserSuite extends AnalysisTest {`
`790`	`790`	`}`
`791`	`791`
`792`	`792`	`test("SPARK-17328 Fix NPE with EXPLAIN DESCRIBE TABLE") {`
	`793`	`+ comparePlans(parsePlan("describe t"),`
`793`	`794`	`DescribeRelation(UnresolvedTableOrView(Seq("t")), Map.empty, isExtended = false))`
`794`	`795`	`comparePlans(parsePlan("describe table t"),`
`795`	`796`	`DescribeRelation(UnresolvedTableOrView(Seq("t")), Map.empty, isExtended = false))`