Repository: sqoop Updated Branches: refs/heads/branch-1.4.7 13ec21cda -> a3c7e6b86
SQOOP-3194: HCatalogExportTest fails because of column escaping problems (Szabolcs Vasas via Anna Szonyi) Project: http://git-wip-us.apache.org/repos/asf/sqoop/repo Commit: http://git-wip-us.apache.org/repos/asf/sqoop/commit/dffb2f92 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/dffb2f92 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/dffb2f92 Branch: refs/heads/branch-1.4.7 Commit: dffb2f92993b851a4205639c2148d0b9682a435b Parents: 13ec21c Author: Anna Szonyi <[email protected]> Authored: Tue Jun 20 12:14:25 2017 +0200 Committer: Attila Szabo <[email protected]> Committed: Mon Oct 30 14:42:07 2017 +0100 ---------------------------------------------------------------------- src/test/org/apache/sqoop/hcat/HCatalogExportTest.java | 8 ++++---- src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java | 2 +- 2 files changed, 5 insertions(+), 5 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/dffb2f92/src/test/org/apache/sqoop/hcat/HCatalogExportTest.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/hcat/HCatalogExportTest.java b/src/test/org/apache/sqoop/hcat/HCatalogExportTest.java index 32add56..7ff046e 100644 --- a/src/test/org/apache/sqoop/hcat/HCatalogExportTest.java +++ b/src/test/org/apache/sqoop/hcat/HCatalogExportTest.java @@ -113,8 +113,8 @@ public class HCatalogExportTest extends ExportJobTestCase { Object expectedMin = generator.getDBValue(minId); Object expectedMax = generator.getDBValue(maxId); - utils.assertSqlColValForRowId(conn, table, minId, colName, true, expectedMin); - utils.assertSqlColValForRowId(conn, table, maxId, colName, true, expectedMax); + utils.assertSqlColValForRowId(conn, table, minId, colName, false, expectedMin); + utils.assertSqlColValForRowId(conn, table, maxId, colName, false, expectedMax); } protected void runHCatExport(List<String> addlArgsArray, @@ -122,7 +122,7 @@ public class HCatalogExportTest extends ExportJobTestCase { ColumnGenerator[] cols) throws Exception { utils.createHCatTable(CreateMode.CREATE_AND_LOAD, totalRecords, table, cols); - utils.createSqlTable(getConnection(), true, totalRecords, table, true, cols); + utils.createSqlTable(getConnection(), true, totalRecords, table, false, cols); Map<String, String> addlArgsMap = utils.getAddlTestArgs(); addlArgsArray.add("--verbose"); addlArgsArray.add("-m"); @@ -338,7 +338,7 @@ public class HCatalogExportTest extends ExportJobTestCase { }; List<String> addlArgsArray = new ArrayList<String>(); addlArgsArray.add("--columns"); - addlArgsArray.add("id,msg"); + addlArgsArray.add("ID,MSG"); runHCatExport(addlArgsArray, TOTAL_RECORDS, table, cols); } http://git-wip-us.apache.org/repos/asf/sqoop/blob/dffb2f92/src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java ---------------------------------------------------------------------- diff --git a/src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java b/src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java index 4301a33..6fb6486 100644 --- a/src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java +++ b/src/test/org/apache/sqoop/hcat/HCatalogTestUtils.java @@ -577,7 +577,7 @@ public final class HCatalogTestUtils { LOG.info("Verifying column " + colName + " has value " + expectedVal); String escapeStr = escapeId? "\"" : ""; PreparedStatement statement = conn.prepareStatement( - "SELECT "+escapeStr + colName + escapeStr+" FROM " + table + " WHERE "+escapeStr+"id"+escapeStr+" = " + id, + "SELECT \"" + colName +"\" FROM " + table + " WHERE "+escapeStr+"id"+escapeStr+" = " + id, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); Object actualVal = null; try {
