Skip to content

[SPARK-53526][SQL] Enable SQL scripting by default #52272

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
wants to merge 1 commit into from
Closed

[SPARK-53526][SQL] Enable SQL scripting by default #52272

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion sql/catalyst/src/main/scala/org/apache/spark/sql/internal/SQLConf.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4142,7 +4142,7 @@ object SQLConf {
"flow and error handling.")
.version("4.0.0")
.booleanConf
.createWithDefault(false)
.createWithDefault(true)

val CONCAT_BINARY_AS_STRING = buildConf("spark.sql.function.concatBinaryAsString")
.doc("When this option is set to false and all inputs are binary, `functions.concat` returns " +
Expand Down
12 changes: 0 additions & 12 deletions ...atalyst/src/test/scala/org/apache/spark/sql/catalyst/parser/SqlScriptingParserSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,22 +23,10 @@ import org.apache.spark.sql.catalyst.plans.SQLHelper
import org.apache.spark.sql.catalyst.plans.logical.{CompoundBody, CreateVariable, ExceptionHandler, ForStatement, IfElseStatement, IterateStatement, LeaveStatement, LoopStatement, Project, RepeatStatement, SearchedCaseStatement, SetVariable, SimpleCaseStatement, SingleStatement, WhileStatement}
import org.apache.spark.sql.errors.DataTypeErrors.toSQLId
import org.apache.spark.sql.exceptions.SqlScriptingException
import org.apache.spark.sql.internal.SQLConf

class SqlScriptingParserSuite extends SparkFunSuite with SQLHelper {
import CatalystSqlParser._

// Tests setup
protected override def beforeAll(): Unit = {
super.beforeAll()
conf.setConfString(SQLConf.SQL_SCRIPTING_ENABLED.key, "true")
}

protected override def afterAll(): Unit = {
conf.unsetConf(SQLConf.SQL_SCRIPTING_ENABLED.key)
super.afterAll()
}

// Tests
test("single select") {
val sqlScriptText = "SELECT 1;"
Expand Down
17 changes: 7 additions & 10 deletions sql/core/src/test/scala/org/apache/spark/sql/execution/ExecuteImmediateEndToEndSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,6 @@
package org.apache.spark.sql.execution

import org.apache.spark.sql.{AnalysisException, QueryTest}
import org.apache.spark.sql.internal.SQLConf
import org.apache.spark.sql.test.SharedSparkSession

class ExecuteImmediateEndToEndSuite extends QueryTest with SharedSparkSession {
Expand All @@ -39,14 +38,12 @@ class ExecuteImmediateEndToEndSuite extends QueryTest with SharedSparkSession {
}

test("SQL Scripting not supported inside EXECUTE IMMEDIATE") {
withSQLConf(SQLConf.SQL_SCRIPTING_ENABLED.key -> "true") {
val executeImmediateText = "EXECUTE IMMEDIATE 'BEGIN SELECT 1; END'"
checkError(
exception = intercept[AnalysisException ] {
spark.sql(executeImmediateText)
},
condition = "SQL_SCRIPT_IN_EXECUTE_IMMEDIATE",
parameters = Map("sqlString" -> "BEGIN SELECT 1; END"))
}
val executeImmediateText = "EXECUTE IMMEDIATE 'BEGIN SELECT 1; END'"
checkError(
exception = intercept[AnalysisException ] {
spark.sql(executeImmediateText)
},
condition = "SQL_SCRIPT_IN_EXECUTE_IMMEDIATE",
parameters = Map("sqlString" -> "BEGIN SELECT 1; END"))
}
}
1 change: 0 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingE2eSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,6 @@ class SqlScriptingE2eSuite extends QueryTest with SharedSparkSession {
override protected def sparkConf: SparkConf = {
super.sparkConf
.set(SQLConf.ANSI_ENABLED.key, "true")
.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true")
}

// Tests
Expand Down
1 change: 0 additions & 1 deletion sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingExecutionSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,6 @@ class SqlScriptingExecutionSuite extends QueryTest with SharedSparkSession {
override protected def sparkConf: SparkConf = {
super.sparkConf
.set(SQLConf.ANSI_ENABLED.key, "true")
.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true")
}

// Helpers
Expand Down
7 changes: 1 addition & 6 deletions sql/core/src/test/scala/org/apache/spark/sql/scripting/SqlScriptingInterpreterSuite.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@

package org.apache.spark.sql.scripting

import org.apache.spark.{SparkConf, SparkException, SparkNumberFormatException}
import org.apache.spark.{SparkException, SparkNumberFormatException}
import org.apache.spark.sql.{AnalysisException, QueryTest, Row}
import org.apache.spark.sql.catalyst.QueryPlanningTracker
import org.apache.spark.sql.catalyst.expressions.Expression
Expand All @@ -38,11 +38,6 @@ class SqlScriptingInterpreterSuite
with SharedSparkSession
with SqlScriptingTestUtils {

// Tests setup
override protected def sparkConf: SparkConf = {
super.sparkConf.set(SQLConf.SQL_SCRIPTING_ENABLED.key, "true")
}

// Helpers
private def runSqlScript(
sqlText: String,
Expand Down