Updated JDBCDialects to save VARCHAR size to metadata

rama-mullapudi · rama-mullapudi · commit 4c2a7a437544 · 2015-09-29T03:37:35.000-04:00
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/JdbcDialects.scala
@@ -293,6 +293,15 @@ case object MsSqlServerDialect extends JdbcDialect {
 @DeveloperApi
 case object OracleDialect extends JdbcDialect {
   override def canHandle(url: String): Boolean = url.startsWith("jdbc:oracle")
+  override def getCatalystType(
+      sqlType: Int, typeName: String, size: Int, md: MetadataBuilder): Option[DataType] = {
+    if (sqlType == Types.VARCHAR && typeName.equals("VARCHAR")) {
+      //Save varchar size to metadata
+      md.putLong("maxlength", size)
+      Some(LongType)
+    } else None
+  }
+
   override def getJDBCType(dt: DataType, md: Metadata): Option[JdbcType] = {
     if (dt == StringType && md.contains("maxlength")) {
       Some(JdbcType(s"VARCHAR(${md.getLong("maxlength")})", java.sql.Types.VARCHAR))
@@ -311,6 +320,15 @@ case object OracleDialect extends JdbcDialect {
 @DeveloperApi
 case object NetezzaDialect extends JdbcDialect {
   override def canHandle(url: String): Boolean = url.startsWith("jdbc:netezza")
+  override def getCatalystType(
+      sqlType: Int, typeName: String, size: Int, md: MetadataBuilder): Option[DataType] = {
+    if (sqlType == Types.VARCHAR && typeName.equals("VARCHAR")) {
+      //Save varchar size to metadata
+      md.putLong("maxlength", size)
+      Some(LongType)
+    } else None
+  }
+
   override def getJDBCType(dt: DataType, md: Metadata): Option[JdbcType] = {
     if (dt == StringType && md.contains("maxlength")) {
       Some(JdbcType(s"VARCHAR(${md.getLong("maxlength")})", java.sql.Types.VARCHAR))
