Repository: sqoop Updated Branches: refs/heads/trunk db4a8fc2f -> 83f0c1a40
SQOOP-2911: Fix failing HCatalogExportTest caused by SQOOP-2863 (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/83f0c1a4 Tree: http://git-wip-us.apache.org/repos/asf/sqoop/tree/83f0c1a4 Diff: http://git-wip-us.apache.org/repos/asf/sqoop/diff/83f0c1a4 Branch: refs/heads/trunk Commit: 83f0c1a40b96d7aab8262fae527066770dba097d Parents: db4a8fc Author: Jarek Jarcec Cecho <[email protected]> Authored: Wed May 18 13:32:22 2016 -0700 Committer: Jarek Jarcec Cecho <[email protected]> Committed: Wed May 18 13:32:22 2016 -0700 ---------------------------------------------------------------------- src/test/com/cloudera/sqoop/TestExport.java | 8 ++++---- .../com/cloudera/sqoop/testutil/ExportJobTestCase.java | 12 ++++++------ 2 files changed, 10 insertions(+), 10 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/sqoop/blob/83f0c1a4/src/test/com/cloudera/sqoop/TestExport.java ---------------------------------------------------------------------- diff --git a/src/test/com/cloudera/sqoop/TestExport.java b/src/test/com/cloudera/sqoop/TestExport.java index c4c264d..62e4a64 100644 --- a/src/test/com/cloudera/sqoop/TestExport.java +++ b/src/test/com/cloudera/sqoop/TestExport.java @@ -280,7 +280,7 @@ public class TestExport extends ExportJobTestCase { StringBuilder sb = new StringBuilder(); sb.append("CREATE TABLE "); sb.append(getTableName()); - sb.append(" (\"id\" INT NOT NULL PRIMARY KEY, \"msg\" VARCHAR(64)"); + sb.append(" (\"ID\" INT NOT NULL PRIMARY KEY, \"MSG\" VARCHAR(64)"); int colNum = 0; for (ColumnGenerator gen : extraColumns) { sb.append(", \"" + forIdx(colNum++) + "\" " + gen.getType()); @@ -326,7 +326,7 @@ public class TestExport extends ExportJobTestCase { StringBuilder sb = new StringBuilder(); sb.append("CREATE TABLE "); sb.append(stageTableName); - sb.append(" (\"id\" INT NOT NULL PRIMARY KEY, \"msg\" VARCHAR(64)"); + sb.append(" (\"ID\" INT NOT NULL PRIMARY KEY, \"MSG\" VARCHAR(64)"); int colNum = 0; for (ColumnGenerator gen : extraColumns) { sb.append(", \"" + forIdx(colNum++) + "\" " + gen.getType()); @@ -363,7 +363,7 @@ public class TestExport extends ExportJobTestCase { LOG.info("Verifying column " + colName + " has value " + expectedVal); PreparedStatement statement = conn.prepareStatement( - "SELECT \"" + colName + "\" FROM " + getTableName() + " WHERE \"id\" = " + id, + "SELECT \"" + colName + "\" FROM " + getTableName() + " WHERE \"ID\" = " + id, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); String actualVal = null; try { @@ -796,7 +796,7 @@ public class TestExport extends ExportJobTestCase { } public void testColumnsExport() throws IOException, SQLException { - testColumnsExport("id,msg," + forIdx(0) + "," + forIdx(2)); + testColumnsExport("ID,MSG," + forIdx(0) + "," + forIdx(2)); } /** http://git-wip-us.apache.org/repos/asf/sqoop/blob/83f0c1a4/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java ---------------------------------------------------------------------- diff --git a/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java b/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java index 786bd94..e2adc52 100644 --- a/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java +++ b/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java @@ -173,7 +173,7 @@ public abstract class ExportJobTestCase extends BaseSqoopTestCase { /** @return the minimum 'id' value in the table */ protected int getMinRowId(Connection conn) throws SQLException { PreparedStatement statement = conn.prepareStatement( - "SELECT MIN(\"id\") FROM " + getTableName(), + "SELECT MIN(\"ID\") FROM " + getTableName(), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); int minVal = 0; try { @@ -194,7 +194,7 @@ public abstract class ExportJobTestCase extends BaseSqoopTestCase { /** @return the maximum 'id' value in the table */ protected int getMaxRowId(Connection conn) throws SQLException { PreparedStatement statement = conn.prepareStatement( - "SELECT MAX(\"id\") FROM " + getTableName(), + "SELECT MAX(\"ID\") FROM " + getTableName(), ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); int maxVal = 0; try { @@ -266,8 +266,8 @@ public abstract class ExportJobTestCase extends BaseSqoopTestCase { assertEquals("Maximum row had invalid id", expectedNumRecords - 1, maxVal); // Check that the string values associated with these points match up. - statement = conn.prepareStatement("SELECT \"msg\" FROM " + getTableName() - + " WHERE \"id\" = " + minVal, + statement = conn.prepareStatement("SELECT \"MSG\" FROM " + getTableName() + + " WHERE \"ID\" = " + minVal, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); String minMsg = ""; try { @@ -285,8 +285,8 @@ public abstract class ExportJobTestCase extends BaseSqoopTestCase { assertEquals("Invalid msg field for min value", getMsgPrefix() + minVal, minMsg); - statement = conn.prepareStatement("SELECT \"msg\" FROM " + getTableName() - + " WHERE \"id\" = " + maxVal, + statement = conn.prepareStatement("SELECT \"MSG\" FROM " + getTableName() + + " WHERE \"ID\" = " + maxVal, ResultSet.TYPE_FORWARD_ONLY, ResultSet.CONCUR_READ_ONLY); String maxMsg = ""; try {
