Skip to content
Snippets Groups Projects
Commit de0dd6de authored by Tor Myklebust's avatar Tor Myklebust Committed by Reynold Xin
Browse files

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.
parent 61ab0854
No related branches found
No related tags found
No related merge requests found
...@@ -18,9 +18,11 @@ ...@@ -18,9 +18,11 @@
package org.apache.spark.sql.jdbc package org.apache.spark.sql.jdbc
import java.math.BigDecimal import java.math.BigDecimal
import java.sql.DriverManager
import java.util.{Calendar, GregorianCalendar}
import org.apache.spark.sql.test._ import org.apache.spark.sql.test._
import org.scalatest.{FunSuite, BeforeAndAfter} import org.scalatest.{FunSuite, BeforeAndAfter}
import java.sql.DriverManager
import TestSQLContext._ import TestSQLContext._
class JDBCSuite extends FunSuite with BeforeAndAfter { class JDBCSuite extends FunSuite with BeforeAndAfter {
...@@ -206,20 +208,25 @@ class JDBCSuite extends FunSuite with BeforeAndAfter { ...@@ -206,20 +208,25 @@ class JDBCSuite extends FunSuite with BeforeAndAfter {
assert(rows(0).getString(5).equals("I am a clob!")) assert(rows(0).getString(5).equals("I am a clob!"))
} }
test("H2 time types") { test("H2 time types") {
val rows = sql("SELECT * FROM timetypes").collect() val rows = sql("SELECT * FROM timetypes").collect()
assert(rows(0).getAs[java.sql.Timestamp](0).getHours == 12) val cal = new GregorianCalendar(java.util.Locale.ROOT)
assert(rows(0).getAs[java.sql.Timestamp](0).getMinutes == 34) cal.setTime(rows(0).getAs[java.sql.Timestamp](0))
assert(rows(0).getAs[java.sql.Timestamp](0).getSeconds == 56) assert(cal.get(Calendar.HOUR_OF_DAY) == 12)
assert(rows(0).getAs[java.sql.Date](1).getYear == 96) assert(cal.get(Calendar.MINUTE) == 34)
assert(rows(0).getAs[java.sql.Date](1).getMonth == 0) assert(cal.get(Calendar.SECOND) == 56)
assert(rows(0).getAs[java.sql.Date](1).getDate == 1) cal.setTime(rows(0).getAs[java.sql.Timestamp](1))
assert(rows(0).getAs[java.sql.Timestamp](2).getYear == 102) assert(cal.get(Calendar.YEAR) == 1996)
assert(rows(0).getAs[java.sql.Timestamp](2).getMonth == 1) assert(cal.get(Calendar.MONTH) == 0)
assert(rows(0).getAs[java.sql.Timestamp](2).getDate == 20) assert(cal.get(Calendar.DAY_OF_MONTH) == 1)
assert(rows(0).getAs[java.sql.Timestamp](2).getHours == 11) cal.setTime(rows(0).getAs[java.sql.Timestamp](2))
assert(rows(0).getAs[java.sql.Timestamp](2).getMinutes == 22) assert(cal.get(Calendar.YEAR) == 2002)
assert(rows(0).getAs[java.sql.Timestamp](2).getSeconds == 33) assert(cal.get(Calendar.MONTH) == 1)
assert(cal.get(Calendar.DAY_OF_MONTH) == 20)
assert(cal.get(Calendar.HOUR) == 11)
assert(cal.get(Calendar.MINUTE) == 22)
assert(cal.get(Calendar.SECOND) == 33)
assert(rows(0).getAs[java.sql.Timestamp](2).getNanos == 543543543) assert(rows(0).getAs[java.sql.Timestamp](2).getNanos == 543543543)
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment