Skip to content

Commit 614c87a

Browse files
committed
Fix
1 parent d2ef95c commit 614c87a

File tree

2 files changed

+12
-2
lines changed

2 files changed

+12
-2
lines changed

sql/core/src/main/scala/org/apache/spark/sql/DataFrameReader.scala

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -309,8 +309,7 @@ class DataFrameReader private[sql](sparkSession: SparkSession) extends Logging {
309309
val parts: Array[Partition] = predicates.zipWithIndex.map { case (part, i) =>
310310
JDBCPartition(part, i) : Partition
311311
}
312-
val schema = JDBCRelation.getSchema(sparkSession.sessionState.conf.resolver, options)
313-
val relation = JDBCRelation(schema, parts, options)(sparkSession)
312+
val relation = JDBCRelation(parts, options)(sparkSession)
314313
sparkSession.baseRelationToDataFrame(relation)
315314
}
316315

sql/core/src/main/scala/org/apache/spark/sql/execution/datasources/jdbc/JDBCRelation.scala

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -145,6 +145,17 @@ private[sql] object JDBCRelation extends Logging {
145145
case None => tableSchema
146146
}
147147
}
148+
149+
/**
150+
* Resolves a Catalyst schema of a JDBC table and returns [[JDBCRelation]] with the schema.
151+
*/
152+
def apply(
153+
parts: Array[Partition],
154+
jdbcOptions: JDBCOptions)(
155+
sparkSession: SparkSession): JDBCRelation = {
156+
val schema = JDBCRelation.getSchema(sparkSession.sessionState.conf.resolver, jdbcOptions)
157+
JDBCRelation(schema, parts, jdbcOptions)(sparkSession)
158+
}
148159
}
149160

150161
private[sql] case class JDBCRelation(

0 commit comments

Comments
 (0)