0001630: SQL Server bulk loader extra spaces causes truncation error

JumpMind · Mar 5, 2014 · 2aa0e73 · 2aa0e73
1 parent ac134c8
commit 2aa0e73
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 6 deletions.
diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/CsvUtils.java
@@ -106,10 +106,14 @@ public static String escapeCsvData(String[] data, char recordDelimiter, char tex
         ByteArrayOutputStream out = new ByteArrayOutputStream();
         CsvWriter writer = new CsvWriter(new OutputStreamWriter(out), ',');
         writer.setEscapeMode(escapeMode);
-        writer.setRecordDelimiter(recordDelimiter);
-        writer.setTextQualifier(textQualifier);
-        writer.setUseTextQualifier(true);
-        writer.setForceQualifier(true);
+        if (recordDelimiter != '\0') {
+            writer.setRecordDelimiter(recordDelimiter);
+        }
+        if (textQualifier != '\0') {
+            writer.setTextQualifier(textQualifier);
+            writer.setUseTextQualifier(true);
+            writer.setForceQualifier(true);
+        }
         try {
             writer.writeRecord(data);
         } catch (IOException e) {

diff --git a/...ic-mssql/src/main/java/org/jumpmind/symmetric/io/data/writer/MsSqlBulkDatabaseWriter.java b/...ic-mssql/src/main/java/org/jumpmind/symmetric/io/data/writer/MsSqlBulkDatabaseWriter.java
@@ -68,7 +68,7 @@ public void write(CsvData data) {
                 statistics.get(batch).startTimer(DataWriterStatisticConstants.DATABASEMILLIS);
                 try {
                     String formattedData = CsvUtils.escapeCsvData(
-                            data.getParsedData(CsvData.ROW_DATA), ' ', ' ', 
+                            data.getParsedData(CsvData.ROW_DATA), '\0', '\0', 
                             CsvWriter.ESCAPE_MODE_DOUBLED);
                     byte[] dataToLoad = formattedData.getBytes();
                     this.stagedInputFile.getOutputStream().write(dataToLoad);
@@ -104,7 +104,7 @@ protected void flush() {
 	            String sql = String.format("BULK INSERT " + 
 	            		this.getTargetTable().getFullyQualifiedTableName() + 
 	            		" FROM '" + stagedInputFile.getFile().getAbsolutePath()) + "'" +
-	            		" WITH ( FIELDTERMINATOR=',', KEEPIDENTITY, " + (fireTriggers ? "FIRE_TRIGGERS" : "") + ");";
+	            		" WITH ( FIELDTERMINATOR=',', KEEPIDENTITY " + (fireTriggers ? ", FIRE_TRIGGERS" : "") + ");";
 	            Statement stmt = c.createStatement();
 
 	            //TODO:  clean this up, deal with errors, etc.?