From 37ba8b4b6e6373b6f9579f8754eeff63f89cba06 Mon Sep 17 00:00:00 2001
From: Daoyuan Wang <daoyuan.wang@intel.com>
Date: Wed, 22 Apr 2015 19:14:28 -0700
Subject: [PATCH] [SPARK-6967] [SQL] fix date type convertion in jdbcrdd

This pr convert java.sql.Date type into Int for JDBCRDD.

Author: Daoyuan Wang <daoyuan.wang@intel.com>

Closes #5590 from adrian-wang/datebug and squashes the following commits:

f897b81 [Daoyuan Wang] add a test case
3c9184c [Daoyuan Wang] fix date type convertion in jdbcrdd

(cherry picked from commit 04525c077c638a7e615c294ba988e35036554f5f)
Signed-off-by: Reynold Xin <rxin@databricks.com>

Conflicts:
	sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala
---
 .../src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala | 3 ++-
 .../test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala   | 7 +++++++
 2 files changed, 9 insertions(+), 1 deletion(-)

diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala
index 9fa016b0053fc..19327443dd45a 100644
--- a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala
+++ b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JDBCRDD.scala
@@ -350,7 +350,8 @@ private[sql] class JDBCRDD(
           val pos = i + 1
           conversions(i) match {
             case BooleanConversion    => mutableRow.setBoolean(i, rs.getBoolean(pos))
-            case DateConversion       => mutableRow.update(i, rs.getDate(pos))
+            case DateConversion       =>
+              mutableRow.update(i, DateUtils.fromJavaDate(rs.getDate(pos)))
             case DecimalConversion    => mutableRow.update(i, rs.getBigDecimal(pos))
             case DoubleConversion     => mutableRow.setDouble(i, rs.getDouble(pos))
             case FloatConversion      => mutableRow.setFloat(i, rs.getFloat(pos))
diff --git a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
index 592ed4b23b7d3..912f56b734f68 100644
--- a/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
+++ b/sql/core/src/test/scala/org/apache/spark/sql/jdbc/JDBCSuite.scala
@@ -247,6 +247,13 @@ class JDBCSuite extends FunSuite with BeforeAndAfter {
     assert(rows(0).getAs[java.sql.Timestamp](2).getNanos == 543543543)
   }
 
+  test("test DATE types") {
+    val rows = TestSQLContext.jdbc(urlWithUserAndPass, "TEST.TIMETYPES").collect()
+    val cachedRows = TestSQLContext.jdbc(urlWithUserAndPass, "TEST.TIMETYPES").cache().collect()
+    assert(rows(0).getAs[java.sql.Date](1) === java.sql.Date.valueOf("1996-01-01"))
+    assert(cachedRows(0).getAs[java.sql.Date](1) === java.sql.Date.valueOf("1996-01-01"))
+  }
+
   test("H2 floating-point types") {
     val rows = sql("SELECT * FROM flttypes").collect()
     assert(rows(0).getDouble(0) == 1.00000000000000022) // Yes, I meant ==.