From 3ffbcc9db7e98cdb32cab4d369fd19f121e9a067 Mon Sep 17 00:00:00 2001
From: TonyO <tonero@TonyOs-iMac.local>
Date: Sun, 25 Mar 2018 23:23:11 -0500
Subject: [PATCH] remove whitespaces between column names options

---
 .../exporters/sql/SqlCreateBuilder.java       | 21 ++++++++++++++-----
 .../exporters/sql/SqlInsertBuilder.java       | 12 ++++++++---
 2 files changed, 25 insertions(+), 8 deletions(-)

diff --git a/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java b/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java
index 32e043c88..ba0ffdadf 100755
--- a/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java
+++ b/main/src/com/google/refine/exporters/sql/SqlCreateBuilder.java
@@ -60,9 +60,9 @@ public class SqlCreateBuilder {
 
         JSONArray columnOptionArray = options == null ? null : JSONUtilities.getArray(options, "columns");
         
-        final boolean trimColNames = options == null ? true
-                : JSONUtilities.getBoolean(options, "trimColumnNames", false);
-
+        final boolean trimColNames = options == null ? false : JSONUtilities.getBoolean(options, "trimColumnNames", false);
+                
+        //logger.info("Trim Column Names::" + trimColNames);
         int count = columnOptionArray.length();
 
         for (int i = 0; i < count; i++) {
@@ -71,10 +71,13 @@ public class SqlCreateBuilder {
                 String name = JSONUtilities.getString(columnOptions, "name", null);
                 String type = JSONUtilities.getString(columnOptions, "type", "VARCHAR");
                 String size = JSONUtilities.getString(columnOptions, "size", "");
-               
+                //logger.info("Before Trim Column Names::" + name);
+                
                 if (name != null) {
                     if(trimColNames) {
-                        createSB.append(name.trim() + " ");
+                        String trimmedCol = name.replaceAll("\\s", "");
+                        createSB.append( trimmedCol + " ");
+                        //logger.info("After Trim Column Names::" + name);
                     }else{
                         createSB.append(name + " ");
                     }
@@ -134,5 +137,13 @@ public class SqlCreateBuilder {
         }
         return createSQL;
     }
+    
+//    public static void main(String[] args) {
+//        String column = "Column 1 With Spaces";
+//        String newCol = column.replaceAll("\\s", "");
+//        
+//        logger.info("Column after trim:" + newCol);
+//        
+//    }
 
 }
diff --git a/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java b/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java
index 7e9e77a1b..97fea4077 100755
--- a/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java
+++ b/main/src/com/google/refine/exporters/sql/SqlInsertBuilder.java
@@ -85,9 +85,15 @@ public class SqlInsertBuilder {
                 colOptionsMap.put("" + json.get("name"), json);
             });
         }
-        
-        String colNamesWithSep = columns.stream()
-                .collect(Collectors.joining(","));
+        final boolean trimColNames = options == null ? false : JSONUtilities.getBoolean(options, "trimColumnNames", false);
+        String colNamesWithSep = null;
+        if(trimColNames) {
+            colNamesWithSep = columns.stream().map(col -> col.replaceAll("\\s", "")).collect(Collectors.joining(","));
+        }else {
+            colNamesWithSep = columns.stream().collect(Collectors.joining(","));  
+        }
+      
+                
         StringBuffer values = new StringBuffer();
        
         int idx = 0;