Repository: sqoop Updated Branches: refs/heads/sqoop2 cea627fa1 -> bb81a890b
SQOOP-2817: Sqoop2: NullValueTest fails when running against MySQL database (Abraham Fine via Jarek Jarcec Cecho) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/bb81a890 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/bb81a890 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/bb81a890 Branch: refs/heads/sqoop2 Commit: bb81a890b164e49bdd127e314dd17aacd0521139 Parents: cea627f Author: Jarek Jarcec Cecho <[email protected]> Authored: Thu Feb 4 14:26:46 2016 -0800 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Thu Feb 4 14:26:46 2016 -0800 ---------------------------------------------------------------------- .../apache/sqoop/integration/connector/hdfs/NullValueTest.java | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/bb81a890/test/src/test/java/org/apache/sqoop/integration/connector/hdfs/NullValueTest.java ---------------------------------------------------------------------- diff --git a/test/src/test/java/org/apache/sqoop/integration/connector/hdfs/NullValueTest.java b/test/src/test/java/org/apache/sqoop/integration/connector/hdfs/NullValueTest.java index 4363814..3ec4f66 100644 --- a/test/src/test/java/org/apache/sqoop/integration/connector/hdfs/NullValueTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/connector/hdfs/NullValueTest.java @@ -100,7 +100,7 @@ public class NullValueTest extends SqoopTestCase { private String[] getCsv() { return new String[] { - "1,'USA'," + nullValue + ",'San Francisco'", + "1,'USA','2004-10-23 00:00:00.000','San Francisco'", "2,'USA','2004-10-24 00:00:00.000'," + nullValue, "3," + nullValue + ",'2004-10-25 00:00:00.000','Brno'", "4,'USA','2004-10-26 00:00:00.000','Palo Alto'" @@ -158,7 +158,7 @@ public class NullValueTest extends SqoopTestCase { executeJob(job); Assert.assertEquals(4L, provider.rowCount(getTableName())); - assertRowInCities(1, "USA", null, "San Francisco"); + assertRowInCities(1, "USA", Timestamp.valueOf("2004-10-23 00:00:00.000"), "San Francisco"); assertRowInCities(2, "USA", Timestamp.valueOf("2004-10-24 00:00:00.000"), (String) null); assertRowInCities(3, (String) null, Timestamp.valueOf("2004-10-25 00:00:00.000"), "Brno"); assertRowInCities(4, "USA", Timestamp.valueOf("2004-10-26 00:00:00.000"), "Palo Alto"); @@ -166,7 +166,7 @@ public class NullValueTest extends SqoopTestCase { @Test public void testToHdfs() throws Exception { - provider.insertRow(getTableName(), 1, "USA", (java.sql.Timestamp) null, "San Francisco"); + provider.insertRow(getTableName(), 1, "USA", Timestamp.valueOf("2004-10-23 00:00:00.000"), "San Francisco"); provider.insertRow(getTableName(), 2, "USA", Timestamp.valueOf("2004-10-24 00:00:00.000"), (String) null); provider.insertRow(getTableName(), 3, (String) null, Timestamp.valueOf("2004-10-25 00:00:00.000"), "Brno"); provider.insertRow(getTableName(), 4, "USA", Timestamp.valueOf("2004-10-26 00:00:00.000"), "Palo Alto");
