From cb911f34b4b2c33047834bdbb4c5ce685cdf958c Mon Sep 17 00:00:00 2001
From: Andrew Bayer <abayer@apache.org>
Date: Fri, 22 Jul 2011 20:04:37 +0000
Subject: [PATCH] SQOOP-67. NPE when column name list contains spaces - e.g.
 sqoop -import --columns "col1, col2"

From: Jonathan Hsieh <jon@cloudera.com>

git-svn-id: https://svn.apache.org/repos/asf/incubator/sqoop/trunk@1150042 13f79535-47bb-0310-9956-ffa450edef68
---
 .../com/cloudera/sqoop/tool/ImportTool.java   |  6 ++-
 .../com/cloudera/sqoop/TestMultiCols.java     | 37 +++++++++++++++++++
 2 files changed, 42 insertions(+), 1 deletion(-)

diff --git a/src/java/com/cloudera/sqoop/tool/ImportTool.java b/src/java/com/cloudera/sqoop/tool/ImportTool.java
index 39448e68..c62b46e8 100644
--- a/src/java/com/cloudera/sqoop/tool/ImportTool.java
+++ b/src/java/com/cloudera/sqoop/tool/ImportTool.java
@@ -653,7 +653,11 @@ public void applyOptions(CommandLine in, SqoopOptions out)
         }
 
         if (in.hasOption(COLUMNS_ARG)) {
-          out.setColumns(in.getOptionValue(COLUMNS_ARG).split(","));
+          String[] cols= in.getOptionValue(COLUMNS_ARG).split(",");
+          for (int i=0; i<cols.length; i++) {
+            cols[i] = cols[i].trim();
+          }
+          out.setColumns(cols);
         }
 
         if (in.hasOption(SPLIT_BY_ARG)) {
diff --git a/src/test/com/cloudera/sqoop/TestMultiCols.java b/src/test/com/cloudera/sqoop/TestMultiCols.java
index a8697eec..31bf69b6 100644
--- a/src/test/com/cloudera/sqoop/TestMultiCols.java
+++ b/src/test/com/cloudera/sqoop/TestMultiCols.java
@@ -18,6 +18,8 @@
 
 package com.cloudera.sqoop;
 
+import java.io.IOException;
+
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 
@@ -210,4 +212,39 @@ public void testSkipThirdCol() {
     verifyTypes(types, insertVals, validateVals, validateLine, loadCols);
   }
 
+  /**
+   * This tests that the columns argument can handle comma-separated column
+   * names.  So this is like having:
+   *   --columns "DATA_COL0,DATA_COL1,DATA_COL2"
+   * as two args on a sqoop command line
+   *
+   * @throws IOException
+   */
+  public void testSingleColumnsArg() throws IOException {
+    String [] types = { "VARCHAR(32)", "VARCHAR(32)", "VARCHAR(32)" };
+    String [] insertVals = { "'foo'", "'bar'", "'baz'" };
+    String [] validateVals = { "foo", "bar", "baz" };
+    String validateLine = "foo,bar,baz";
+    String [] loadCols = {"DATA_COL0,DATA_COL1,DATA_COL2"};
+
+    verifyTypes(types, insertVals, validateVals, validateLine, loadCols);
+  }
+
+  /**
+   * This tests that the columns argument can handle spaces between column
+   * names.  So this is like having:
+   *   --columns "DATA_COL0, DATA_COL1, DATA_COL2"
+   * as two args on a sqoop command line
+   *
+   * @throws IOException
+   */
+  public void testColumnsWithSpaces() throws IOException {
+    String [] types = { "VARCHAR(32)", "VARCHAR(32)", "VARCHAR(32)" };
+    String [] insertVals = { "'foo'", "'bar'", "'baz'" };
+    String [] validateVals = { "foo", "bar", "baz" };
+    String validateLine = "foo,bar,baz";
+    String [] loadCols = {"DATA_COL0, DATA_COL1, DATA_COL2"};
+
+    verifyTypes(types, insertVals, validateVals, validateLine, loadCols);
+  }
 }