From 37e7c32c60be723b78d7402c991471fa4b3222e8 Mon Sep 17 00:00:00 2001 From: Takeshi Yamamuro Date: Mon, 10 Aug 2020 16:31:35 +0900 Subject: [PATCH 1/2] Fix --- .../sql/jdbc/PostgresIntegrationSuite.scala | 19 +++++++++++++++++++ 1 file changed, 19 insertions(+) diff --git a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala index c3920bdeb28ea..204d101149945 100644 --- a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala +++ b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala @@ -83,6 +83,13 @@ class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite { ).executeUpdate() conn.prepareStatement("INSERT INTO char_types VALUES " + "('abcd', 'efgh', 'ijkl', 'mnop', 'q')").executeUpdate() + + conn.prepareStatement("CREATE TABLE char_array_types (" + + "c0 char(4)[], c1 character(4)[], c2 character varying(4)[], c3 varchar(4)[], c4 bpchar[])" + ).executeUpdate() + conn.prepareStatement("INSERT INTO char_array_types VALUES " + + """('{"a", "bcd"}', '{"ef", "gh"}', '{"i", "j", "kl"}', '{"mnop"}', '{"q", "r"}')""" + ).executeUpdate() } test("Type mapping for various types") { @@ -235,4 +242,16 @@ class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite { assert(row(0).getString(3) === "mnop") assert(row(0).getString(4) === "q") } + + test("character array type tests") { + val df = sqlContext.read.jdbc(jdbcUrl, "char_array_types", new Properties) + val row = df.collect() + assert(row.length == 1) + assert(row(0).length === 5) + assert(row(0).getSeq[String](0) === Seq("a ", "bcd ")) + assert(row(0).getSeq[String](1) === Seq("ef ", "gh ")) + assert(row(0).getSeq[String](2) === Seq("i", "j", "kl")) + assert(row(0).getSeq[String](3) === Seq("mnop")) + assert(row(0).getSeq[String](4) === Seq("q", "r")) + } } From 9907bf52cd270c0e1254dbbd085630b29d7cce39 Mon Sep 17 00:00:00 2001 From: Takeshi Yamamuro Date: Mon, 10 Aug 2020 18:22:12 +0900 Subject: [PATCH 2/2] add a prefix --- .../org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala index 204d101149945..36d96a69ec659 100644 --- a/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala +++ b/external/docker-integration-tests/src/test/scala/org/apache/spark/sql/jdbc/PostgresIntegrationSuite.scala @@ -243,7 +243,7 @@ class PostgresIntegrationSuite extends DockerJDBCIntegrationSuite { assert(row(0).getString(4) === "q") } - test("character array type tests") { + test("SPARK-32576: character array type tests") { val df = sqlContext.read.jdbc(jdbcUrl, "char_array_types", new Properties) val row = df.collect() assert(row.length == 1)