Add test

miland-db · Jul 26, 2024 · fa82a44 · fa82a44
1 parent 6a37dcc
commit fa82a44
Show file tree

Hide file tree

Showing 2 changed files with 29 additions and 2 deletions.
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala b/sql/core/src/main/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionNode.scala
@@ -187,7 +187,6 @@ class CompoundBodyExec(
         statement.reset() // Clear all flags and result
         handler.reset()
         curr = Some(handler.getHandlerBody)
-//        return handler.getHandlerBody
       }
     }
     statement
@@ -217,7 +216,6 @@ class CompoundBodyExec(
   private var localIterator: Iterator[CompoundStatementExec] = statements.iterator
   private var curr: Option[CompoundStatementExec] =
     if (localIterator.hasNext) Some(localIterator.next()) else None
-  private var prev: Option[CompoundStatementExec] = None
   private var stopIteration: Boolean = false  // hard stop iteration flag
 
   def getTreeIterator: Iterator[CompoundStatementExec] = treeIterator

diff --git a/sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala
@@ -406,4 +406,33 @@ class SqlScriptingInterpreterSuite extends SparkFunSuite with SharedSparkSession
     )
     verifySqlScriptResult(sqlScript, expected)
   }
+
+  test("chained begin end blocks") {
+    val sqlScript =
+      """
+        |BEGIN
+        | BEGIN
+        |   SELECT 1;
+        |   SELECT 2;
+        | END;
+        | BEGIN
+        |   SELECT 3;
+        |   SELECT 4;
+        | END;
+        | BEGIN
+        |   SELECT 5;
+        |   SELECT 6;
+        | END;
+        |END
+        |""".stripMargin
+    val expected = Seq(
+      Array(Row(1)), // select
+      Array(Row(2)), // select
+      Array(Row(3)), // select
+      Array(Row(4)), // select
+      Array(Row(5)), // select
+      Array(Row(6))  // select
+    )
+    verifySqlScriptResult(sqlScript, expected)
+  }
 }