Skip to content

Commit 9a565b8

Browse files
tmykleburxin
authored andcommitted
Avoid deprecation warnings in JDBCSuite.
This pull request replaces calls to deprecated methods from `java.util.Date` with near-equivalents in `java.util.Calendar`. Author: Tor Myklebust <tmyklebu@gmail.com> Closes #4668 from tmyklebu/master and squashes the following commits: 66215b1 [Tor Myklebust] Use GregorianCalendar instead of Timestamp get methods. (cherry picked from commit de0dd6d) Signed-off-by: Reynold Xin <rxin@databricks.com>
1 parent 2bd33ce commit 9a565b8

File tree

1 file changed

+20
-13
lines changed

1 file changed

+20
-13
lines changed

sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala

Lines changed: 20 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,11 @@
1818
package org.apache.spark.sql.jdbc
1919

2020
import java.math.BigDecimal
21+
import java.sql.DriverManager
22+
import java.util.{Calendar, GregorianCalendar}
23+
2124
import org.apache.spark.sql.test._
2225
import org.scalatest.{FunSuite, BeforeAndAfter}
23-
import java.sql.DriverManager
2426
import TestSQLContext._
2527

2628
class JDBCSuite extends FunSuite with BeforeAndAfter {
@@ -206,20 +208,25 @@ class JDBCSuite extends FunSuite with BeforeAndAfter {
206208
assert(rows(0).getString(5).equals("I am a clob!"))
207209
}
208210

211+
209212
test("H2 time types") {
210213
val rows = sql("SELECT * FROM timetypes").collect()
211-
assert(rows(0).getAs[java.sql.Timestamp](0).getHours == 12)
212-
assert(rows(0).getAs[java.sql.Timestamp](0).getMinutes == 34)
213-
assert(rows(0).getAs[java.sql.Timestamp](0).getSeconds == 56)
214-
assert(rows(0).getAs[java.sql.Date](1).getYear == 96)
215-
assert(rows(0).getAs[java.sql.Date](1).getMonth == 0)
216-
assert(rows(0).getAs[java.sql.Date](1).getDate == 1)
217-
assert(rows(0).getAs[java.sql.Timestamp](2).getYear == 102)
218-
assert(rows(0).getAs[java.sql.Timestamp](2).getMonth == 1)
219-
assert(rows(0).getAs[java.sql.Timestamp](2).getDate == 20)
220-
assert(rows(0).getAs[java.sql.Timestamp](2).getHours == 11)
221-
assert(rows(0).getAs[java.sql.Timestamp](2).getMinutes == 22)
222-
assert(rows(0).getAs[java.sql.Timestamp](2).getSeconds == 33)
214+
val cal = new GregorianCalendar(java.util.Locale.ROOT)
215+
cal.setTime(rows(0).getAs[java.sql.Timestamp](0))
216+
assert(cal.get(Calendar.HOUR_OF_DAY) == 12)
217+
assert(cal.get(Calendar.MINUTE) == 34)
218+
assert(cal.get(Calendar.SECOND) == 56)
219+
cal.setTime(rows(0).getAs[java.sql.Timestamp](1))
220+
assert(cal.get(Calendar.YEAR) == 1996)
221+
assert(cal.get(Calendar.MONTH) == 0)
222+
assert(cal.get(Calendar.DAY_OF_MONTH) == 1)
223+
cal.setTime(rows(0).getAs[java.sql.Timestamp](2))
224+
assert(cal.get(Calendar.YEAR) == 2002)
225+
assert(cal.get(Calendar.MONTH) == 1)
226+
assert(cal.get(Calendar.DAY_OF_MONTH) == 20)
227+
assert(cal.get(Calendar.HOUR) == 11)
228+
assert(cal.get(Calendar.MINUTE) == 22)
229+
assert(cal.get(Calendar.SECOND) == 33)
223230
assert(rows(0).getAs[java.sql.Timestamp](2).getNanos == 543543543)
224231
}
225232

0 commit comments

Comments
 (0)