[SPARK-11394][SQL] Throw IllegalArgumentException for unsupported types in postgresql

maropu · yhuai · commit 85a871818ee1 · 2015-12-28T21:29:03.000-08:00
If DataFrame has BYTE types, throws an exception: org.postgresql.util.PSQLException: ERROR: type "byte" does not exist Author: Takeshi YAMAMURO <linguin.m.s@gmail.com> Closes apache#9350 from maropu/FixBugInPostgreJdbc. (cherry picked from commit 73862a1) Signed-off-by: Yin Huai <yhuai@databricks.com>
diff --git a/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala b/sql/core/src/main/scala/org/apache/spark/sql/jdbc/PostgresDialect.scala
@@ -64,6 +64,7 @@ private object PostgresDialect extends JdbcDialect {
       getJDBCType(et).map(_.databaseTypeDefinition)
         .orElse(JdbcUtils.getCommonJDBCType(et).map(_.databaseTypeDefinition))
         .map(typeName => JdbcType(s"$typeName[]", java.sql.Types.ARRAY))
+    case ByteType => throw new IllegalArgumentException(s"Unsupported type in postgresql: $dt");
     case _ => None
   }
 
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
@@ -460,6 +460,10 @@ class JDBCSuite extends SparkFunSuite with BeforeAndAfter with SharedSQLContext
     val Postgres = JdbcDialects.get("jdbc:postgresql://127.0.0.1/db")
     assert(Postgres.getCatalystType(java.sql.Types.OTHER, "json", 1, null) === Some(StringType))
     assert(Postgres.getCatalystType(java.sql.Types.OTHER, "jsonb", 1, null) === Some(StringType))
+    val errMsg = intercept[IllegalArgumentException] {
+      Postgres.getJDBCType(ByteType)
+    }
+    assert(errMsg.getMessage contains "Unsupported type in postgresql: ByteType")
   }
 
   test("DerbyDialect jdbc type mapping") {

Original file line number	Diff line number	Diff line change
`@@ -64,6 +64,7 @@ private object PostgresDialect extends JdbcDialect {`
`64`	`64`	`getJDBCType(et).map(_.databaseTypeDefinition)`
`65`	`65`	`.orElse(JdbcUtils.getCommonJDBCType(et).map(_.databaseTypeDefinition))`
`66`	`66`	`.map(typeName => JdbcType(s"$typeName[]", java.sql.Types.ARRAY))`
	`67`	`+ case ByteType => throw new IllegalArgumentException(s"Unsupported type in postgresql: $dt");`
`67`	`68`	`case _ => None`
`68`	`69`	`}`
`69`	`70`