From 2fc3128d1acda12ec3e23378c19c4075c0ba7190 Mon Sep 17 00:00:00 2001 From: Jarek Jarcec Cecho Date: Wed, 9 Dec 2015 10:47:29 +0100 Subject: [PATCH] SQOOP-2730: Sqoop2: Integration: Oracle does not support a boolean type, so do not use them in tests (Abraham Fine via Jarek Jarcec Cecho) --- .../sqoop/test/data/UbuntuReleases.java | 41 +++++++++---------- .../jdbc/generic/IncrementalReadTest.java | 40 +++++++++--------- .../jdbc/generic/PartitionerTest.java | 39 +++++++++--------- 3 files changed, 59 insertions(+), 61 deletions(-) diff --git a/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java b/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java index f8aeb387..5b753893 100644 --- a/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java +++ b/test/src/main/java/org/apache/sqoop/test/data/UbuntuReleases.java @@ -39,8 +39,7 @@ public DataSet createTables() { "id", "int", "code_name", "varchar(64)", "version", "numeric(4,2)", - "release_date", "date", - "lts", "boolean" + "release_date", "date" ); return this; @@ -48,25 +47,25 @@ public DataSet createTables() { @Override public DataSet loadBasicData() { - provider.insertRow(tableBaseName, 1, "Warty Warthog", 4.10, "2004-10-20", false); - provider.insertRow(tableBaseName, 2, "Hoary Hedgehog", 5.04, "2005-04-08", false); - provider.insertRow(tableBaseName, 3, "Breezy Badger", 5.10, "2005-10-13", false); - provider.insertRow(tableBaseName, 4, "Dapper Drake", 6.06, "2006-06-01", true); - provider.insertRow(tableBaseName, 5, "Edgy Eft", 6.10, "2006-10-26", false); - provider.insertRow(tableBaseName, 6, "Feisty Fawn", 7.04, "2007-04-19", false); - provider.insertRow(tableBaseName, 7, "Gutsy Gibbon", 7.10, "2007-10-18", false); - provider.insertRow(tableBaseName, 8, "Hardy Heron", 8.04, "2008-04-24", true); - provider.insertRow(tableBaseName, 9, "Intrepid Ibex", 8.10, "2008-10-18", false); - provider.insertRow(tableBaseName, 10, "Jaunty Jackalope", 9.04, "2009-04-23", false); - provider.insertRow(tableBaseName, 11, "Karmic Koala", 9.10, "2009-10-29", false); - provider.insertRow(tableBaseName, 12, "Lucid Lynx", 10.04, "2010-04-29", true); - provider.insertRow(tableBaseName, 13, "Maverick Meerkat",10.10, "2010-10-10", false); - provider.insertRow(tableBaseName, 14, "Natty Narwhal", 11.04, "2011-04-28", false); - provider.insertRow(tableBaseName, 15, "Oneiric Ocelot", 11.10, "2011-10-10", false); - provider.insertRow(tableBaseName, 16, "Precise Pangolin",12.04, "2012-04-26", true); - provider.insertRow(tableBaseName, 17, "Quantal Quetzal", 12.10, "2012-10-18", false); - provider.insertRow(tableBaseName, 18, "Raring Ringtail", 13.04, "2013-04-25", false); - provider.insertRow(tableBaseName, 19, "Saucy Salamander",13.10, "2013-10-17", false); + provider.insertRow(tableBaseName, 1, "Warty Warthog", 4.10, "2004-10-20"); + provider.insertRow(tableBaseName, 2, "Hoary Hedgehog", 5.04, "2005-04-08"); + provider.insertRow(tableBaseName, 3, "Breezy Badger", 5.10, "2005-10-13"); + provider.insertRow(tableBaseName, 4, "Dapper Drake", 6.06, "2006-06-01"); + provider.insertRow(tableBaseName, 5, "Edgy Eft", 6.10, "2006-10-26"); + provider.insertRow(tableBaseName, 6, "Feisty Fawn", 7.04, "2007-04-19"); + provider.insertRow(tableBaseName, 7, "Gutsy Gibbon", 7.10, "2007-10-18"); + provider.insertRow(tableBaseName, 8, "Hardy Heron", 8.04, "2008-04-24"); + provider.insertRow(tableBaseName, 9, "Intrepid Ibex", 8.10, "2008-10-18"); + provider.insertRow(tableBaseName, 10, "Jaunty Jackalope", 9.04, "2009-04-23"); + provider.insertRow(tableBaseName, 11, "Karmic Koala", 9.10, "2009-10-29"); + provider.insertRow(tableBaseName, 12, "Lucid Lynx", 10.04, "2010-04-29"); + provider.insertRow(tableBaseName, 13, "Maverick Meerkat",10.10, "2010-10-10"); + provider.insertRow(tableBaseName, 14, "Natty Narwhal", 11.04, "2011-04-28"); + provider.insertRow(tableBaseName, 15, "Oneiric Ocelot", 11.10, "2011-10-10"); + provider.insertRow(tableBaseName, 16, "Precise Pangolin",12.04, "2012-04-26"); + provider.insertRow(tableBaseName, 17, "Quantal Quetzal", 12.10, "2012-10-18"); + provider.insertRow(tableBaseName, 18, "Raring Ringtail", 13.04, "2013-04-25"); + provider.insertRow(tableBaseName, 19, "Saucy Salamander",13.10, "2013-10-17"); return this; } diff --git a/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/IncrementalReadTest.java b/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/IncrementalReadTest.java index 38ebb749..131ad5ee 100644 --- a/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/IncrementalReadTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/IncrementalReadTest.java @@ -107,16 +107,16 @@ public void testTable() throws Exception { // Assert correct output assertTo( - "10,'Jaunty Jackalope',9.04,'2009-04-23',false", - "11,'Karmic Koala',9.10,'2009-10-29',false", - "12,'Lucid Lynx',10.04,'2010-04-29',true", - "13,'Maverick Meerkat',10.10,'2010-10-10',false", - "14,'Natty Narwhal',11.04,'2011-04-28',false", - "15,'Oneiric Ocelot',11.10,'2011-10-10',false", - "16,'Precise Pangolin',12.04,'2012-04-26',true", - "17,'Quantal Quetzal',12.10,'2012-10-18',false", - "18,'Raring Ringtail',13.04,'2013-04-25',false", - "19,'Saucy Salamander',13.10,'2013-10-17',false" + "10,'Jaunty Jackalope',9.04,'2009-04-23'", + "11,'Karmic Koala',9.10,'2009-10-29'", + "12,'Lucid Lynx',10.04,'2010-04-29'", + "13,'Maverick Meerkat',10.10,'2010-10-10'", + "14,'Natty Narwhal',11.04,'2011-04-28'", + "15,'Oneiric Ocelot',11.10,'2011-10-10'", + "16,'Precise Pangolin',12.04,'2012-04-26'", + "17,'Quantal Quetzal',12.10,'2012-10-18'", + "18,'Raring Ringtail',13.04,'2013-04-25'", + "19,'Saucy Salamander',13.10,'2013-10-17'" ); // Verify new last value @@ -162,16 +162,16 @@ public void testQuery() throws Exception { // Assert correct output assertTo( - "10,'Jaunty Jackalope',9.04,'2009-04-23',false", - "11,'Karmic Koala',9.10,'2009-10-29',false", - "12,'Lucid Lynx',10.04,'2010-04-29',true", - "13,'Maverick Meerkat',10.10,'2010-10-10',false", - "14,'Natty Narwhal',11.04,'2011-04-28',false", - "15,'Oneiric Ocelot',11.10,'2011-10-10',false", - "16,'Precise Pangolin',12.04,'2012-04-26',true", - "17,'Quantal Quetzal',12.10,'2012-10-18',false", - "18,'Raring Ringtail',13.04,'2013-04-25',false", - "19,'Saucy Salamander',13.10,'2013-10-17',false" + "10,'Jaunty Jackalope',9.04,'2009-04-23'", + "11,'Karmic Koala',9.10,'2009-10-29'", + "12,'Lucid Lynx',10.04,'2010-04-29'", + "13,'Maverick Meerkat',10.10,'2010-10-10'", + "14,'Natty Narwhal',11.04,'2011-04-28'", + "15,'Oneiric Ocelot',11.10,'2011-10-10'", + "16,'Precise Pangolin',12.04,'2012-04-26'", + "17,'Quantal Quetzal',12.10,'2012-10-18'", + "18,'Raring Ringtail',13.04,'2013-04-25'", + "19,'Saucy Salamander',13.10,'2013-10-17'" ); // Verify new last value diff --git a/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/PartitionerTest.java b/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/PartitionerTest.java index 72728fed..42bff656 100644 --- a/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/PartitionerTest.java +++ b/test/src/test/java/org/apache/sqoop/integration/connector/jdbc/generic/PartitionerTest.java @@ -46,7 +46,6 @@ public class PartitionerTest extends ConnectorTestCase implements ITest { {"code_name", 13}, {"version", 13}, {"release_date", 13}, - {"lts", 2}, }; /** @@ -111,25 +110,25 @@ public void testSplitter() throws Exception { // Assert correct output assertToFiles((extractors > maxOutputFiles) ? maxOutputFiles : extractors); assertTo( - "1,'Warty Warthog',4.10,'2004-10-20',false", - "2,'Hoary Hedgehog',5.04,'2005-04-08',false", - "3,'Breezy Badger',5.10,'2005-10-13',false", - "4,'Dapper Drake',6.06,'2006-06-01',true", - "5,'Edgy Eft',6.10,'2006-10-26',false", - "6,'Feisty Fawn',7.04,'2007-04-19',false", - "7,'Gutsy Gibbon',7.10,'2007-10-18',false", - "8,'Hardy Heron',8.04,'2008-04-24',true", - "9,'Intrepid Ibex',8.10,'2008-10-18',false", - "10,'Jaunty Jackalope',9.04,'2009-04-23',false", - "11,'Karmic Koala',9.10,'2009-10-29',false", - "12,'Lucid Lynx',10.04,'2010-04-29',true", - "13,'Maverick Meerkat',10.10,'2010-10-10',false", - "14,'Natty Narwhal',11.04,'2011-04-28',false", - "15,'Oneiric Ocelot',11.10,'2011-10-10',false", - "16,'Precise Pangolin',12.04,'2012-04-26',true", - "17,'Quantal Quetzal',12.10,'2012-10-18',false", - "18,'Raring Ringtail',13.04,'2013-04-25',false", - "19,'Saucy Salamander',13.10,'2013-10-17',false" + "1,'Warty Warthog',4.10,'2004-10-20'", + "2,'Hoary Hedgehog',5.04,'2005-04-08'", + "3,'Breezy Badger',5.10,'2005-10-13'", + "4,'Dapper Drake',6.06,'2006-06-01'", + "5,'Edgy Eft',6.10,'2006-10-26'", + "6,'Feisty Fawn',7.04,'2007-04-19'", + "7,'Gutsy Gibbon',7.10,'2007-10-18'", + "8,'Hardy Heron',8.04,'2008-04-24'", + "9,'Intrepid Ibex',8.10,'2008-10-18'", + "10,'Jaunty Jackalope',9.04,'2009-04-23'", + "11,'Karmic Koala',9.10,'2009-10-29'", + "12,'Lucid Lynx',10.04,'2010-04-29'", + "13,'Maverick Meerkat',10.10,'2010-10-10'", + "14,'Natty Narwhal',11.04,'2011-04-28'", + "15,'Oneiric Ocelot',11.10,'2011-10-10'", + "16,'Precise Pangolin',12.04,'2012-04-26'", + "17,'Quantal Quetzal',12.10,'2012-10-18'", + "18,'Raring Ringtail',13.04,'2013-04-25'", + "19,'Saucy Salamander',13.10,'2013-10-17'" ); // Clean up testing table