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

Author: srielau

sql/api/src/main/antlr4/org/apache/spark/sql/catalyst/parser/SqlBaseParser.g4

@@ -1693,12 +1693,8 @@ stringLitWithoutMarker
 ;
 
 stringLit
-    : stringLitWithoutMarker
-    | namedParameterMarkerVal
-    ;
-
-namedParameterMarkerVal
-    : namedParameterMarker                                                                     #namedParameterValue
+    : stringLitWithoutMarker                                                                   #stringLiteralInContext
+    | namedParameterMarker                                                                     #namedParameterValue
     ;
 
 comment

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

@@ -70,6 +70,10 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
     }
   }
 
+  override def visitStringLiteralInContext(ctx: StringLiteralInContextContext): Token = {
+    visit(ctx.stringLitWithoutMarker).asInstanceOf[Token]
+  }
+
   override def visitNamedParameterValue(ctx: NamedParameterValueContext): Token = {
     // For namedParameterValue in data type contexts, this shouldn't normally occur
     // This indicates that parameter substitution failed or wasn't applied
@@ -285,7 +289,7 @@ class DataTypeAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
   /**
    * Visit a stringLit context by delegating to the appropriate labeled visitor.
    */
-  override def visitStringLit(ctx: StringLitContext): Token = {
+  def visitStringLit(ctx: StringLitContext): Token = {
     visit(ctx).asInstanceOf[Token]
   }
 

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

@@ -131,6 +131,9 @@ class SubstituteParmsAstBuilder extends SqlBaseParserBaseVisitor[AnyRef] {
         visitNamedParameterValue(ctx)
       case ctx: NamedParameterIntegerValueContext =>
         visitNamedParameterIntegerValue(ctx)
+      case ctx: StringLiteralInContextContext =>
+        // For string literals in context, continue traversing to find any nested parameters
+        visitChildren(ctx)
       case ruleNode: RuleNode =>
         // Continue traversing children for rule nodes
         visitChildren(ruleNode)

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

@@ -211,13 +211,14 @@ class ParserUtilsSuite extends SparkFunSuite {
     if (token1 != null) {
       assert(string(token1) == "identifier_with_wildcards")
     }
-    
+
     val token2 = dataTypeBuilder.visitStringLit(createDbContext.commentSpec().get(0).stringLit())
     if (token2 != null) {
       assert(string(token2) == "database_comment")
     }
 
-    val token3 = dataTypeBuilder.visitStringLit(createDbContext.locationSpec.asScala.head.stringLit())
+    val token3 = dataTypeBuilder.visitStringLit(
+      createDbContext.locationSpec.asScala.head.stringLit())
     if (token3 != null) {
       assert(string(token3) == "/home/user/db")
     }