Merge branch 'preparser' of github.com:srielau/spark into preparser

Author: srielau

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

@@ -4,7 +4,7 @@
  * this work for additional information regarding copyright ownership.
  * The ASF licenses this file to You under the Apache License, Version 2.0
  * (the "License"); you may not use this file except in compliance with
- * the License.  You may obtain a copy of the License at
+ * the License. You may obtain a copy of the License at
  *
  *    http://www.apache.org/licenses/LICENSE-2.0
  *
@@ -206,6 +206,7 @@ class ParserUtilsSuite extends SparkFunSuite {
   }
 
   test("string") {
+<<<<<<< HEAD
     val dataTypeBuilder = new org.apache.spark.sql.catalyst.parser.DataTypeAstBuilder()
     val token1 = dataTypeBuilder.visitStringLit(showDbsContext.pattern)
     if (token1 != null) {
@@ -221,6 +222,15 @@ class ParserUtilsSuite extends SparkFunSuite {
     if (token3 != null) {
       assert(string(token3) == "/home/user/db")
     }
+=======
+    assert(string(showDbsContext.pattern.stringLiteralValue().STRING_LITERAL()) ==
+      "identifier_with_wildcards")
+    assert(string(createDbContext.commentSpec().get(0).stringLit().stringLiteralValue()
+      .STRING_LITERAL()) == "database_comment")
+
+    assert(string(createDbContext.locationSpec.asScala.head.stringLit().stringLiteralValue()
+      .STRING_LITERAL()) == "/home/user/db")
+>>>>>>> d9a53a852b7ef5766390e7ee8408e58ecf579acb
   }
 
   test("position") {
@@ -250,8 +260,12 @@ class ParserUtilsSuite extends SparkFunSuite {
     val ctx = createDbContext.locationSpec.asScala.head
     val current = CurrentOrigin.get
     val (location, origin) = withOrigin(ctx) {
+<<<<<<< HEAD
       (Option(new org.apache.spark.sql.catalyst.parser.DataTypeAstBuilder()
         .visitStringLit(ctx.stringLit())).map(string).getOrElse(""), CurrentOrigin.get)
+=======
+      (string(ctx.stringLit().stringLiteralValue().STRING_LITERAL), CurrentOrigin.get)
+>>>>>>> d9a53a852b7ef5766390e7ee8408e58ecf579acb
     }
     assert(location == "/home/user/db")
     assert(origin == Origin(Some(3), Some(27)))