From 83f0c1a40b96d7aab8262fae527066770dba097d Mon Sep 17 00:00:00 2001
From: Jarek Jarcec Cecho <jarcec@apache.org>
Date: Wed, 18 May 2016 13:32:22 -0700
Subject: [PATCH] SQOOP-2911: Fix failing HCatalogExportTest caused by
 SQOOP-2863

(Abraham Fine via Jarek Jarcec Cecho)
---
 src/test/com/cloudera/sqoop/TestExport.java          |  8 ++++----
 .../cloudera/sqoop/testutil/ExportJobTestCase.java   | 12 ++++++------
 2 files changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/test/com/cloudera/sqoop/TestExport.java b/src/test/com/cloudera/sqoop/TestExport.java
index c4c264d4..62e4a649 100644
--- a/src/test/com/cloudera/sqoop/TestExport.java
+++ b/src/test/com/cloudera/sqoop/TestExport.java
@@ -280,7 +280,7 @@ public void createTable(ColumnGenerator... extraColumns) throws SQLException {
     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 void createStagingTable(ColumnGenerator... extraColumns)
     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 @@ private void assertColValForRowId(int id, String colName, String expectedVal)
     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 String getType() {
   }
 
   public void testColumnsExport() throws IOException, SQLException {
-    testColumnsExport("id,msg," + forIdx(0) + "," + forIdx(2));
+    testColumnsExport("ID,MSG," + forIdx(0) + "," + forIdx(2));
   }
 
   /**
diff --git a/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java b/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java
index 786bd94f..e2adc52d 100644
--- a/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java
+++ b/src/test/com/cloudera/sqoop/testutil/ExportJobTestCase.java
@@ -173,7 +173,7 @@ protected String getMsgPrefix() {
   /** @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 @@ protected int getMinRowId(Connection conn) throws SQLException {
   /** @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 @@ protected void verifyExport(int expectedNumRecords, Connection conn)
     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 @@ protected void verifyExport(int expectedNumRecords, Connection conn)
     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 {