sumeetgajjar commented on a change in pull request #34693:
URL: https://github.com/apache/spark/pull/34693#discussion_r755398500
##########
File path:
external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/MsSqlServerIntegrationSuite.scala
##########
@@ -356,4 +357,42 @@ class MsSqlServerIntegrationSuite extends
DockerJDBCIntegrationSuite {
0, 3, 0, 0, 0, -1, -1, -1, -1, 0, 0, 0, 0, 7, 0, 0, 0, 0, 0, 0, 0, 0,
2, 0,
0, 0, 0, 1, 0, 0, 0, 3))
}
+
+ test("withClause and query JDBC options") {
+ val expectedResult = Set(
+ (42, "fred"),
+ (17, "dave")
+ ).map { case (x, y) =>
+ Row(Integer.valueOf(x), String.valueOf(y))
+ }
+
+ val withClause = "WITH t AS (SELECT x, y FROM tbl)"
+ val query = "SELECT * FROM t WHERE x > 10"
+ val df = spark.read.format("jdbc")
+ .option("url", jdbcUrl)
+ .option("withClause", withClause)
+ .option("query", query)
+ .load()
+ assert(df.collect.toSet === expectedResult)
+
+ df.explain(true)
+ }
+
+ test("withClause and dbtable JDBC options") {
+ val expectedResult = Set(
+ (42, "fred"),
+ (17, "dave")
+ ).map { case (x, y) =>
+ Row(Integer.valueOf(x), String.valueOf(y))
+ }
+
+ val withClause = "WITH t AS (SELECT x, y FROM tbl WHERE x > 10)"
+ val dbtable = "t"
+ val df = spark.read.format("jdbc")
+ .option("url", jdbcUrl)
+ .option("withClause", withClause)
+ .option("dbtable", dbtable)
+ .load()
+ assert(df.collect.toSet === expectedResult)
+ }
Review comment:
Since it already works with temp table syntax, should we also add the
corresponding UTs?
##########
File path:
sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRelation.scala
##########
@@ -325,6 +325,6 @@ private[sql] case class JDBCRelation(
override def toString: String = {
val partitioningInfo = if (parts.nonEmpty) s"
[numPartitions=${parts.length}]" else ""
// credentials should not be included in the plan output, table
information is sufficient.
- s"JDBCRelation(${jdbcOptions.tableOrQuery})" + partitioningInfo
+ s"JDBCRelation(${jdbcOptions.withClause}${jdbcOptions.tableOrQuery})" +
partitioningInfo
Review comment:
Since `partitioningInfo` is also a string, should we create the final
string as
`s"JDBCRelation(${jdbcOptions.withClause}${jdbcOptions.tableOrQuery})$partitioningInfo"`?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
