0005092: Lexical error when issuing a foreign key correction with a

carriage return in the data
JumpMind · Sep 28, 2021 · 8d5aaf1 · 8d5aaf1
1 parent 17c33f4
commit 8d5aaf1
Showing 1 changed file with 4 additions and 1 deletion.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/DataService.java
@@ -2539,7 +2539,10 @@ public void reloadMissingForeignKeyRowsReverse(String sourceNodeId, Table table,
     }
 
     public void reloadMissingForeignKeyRowsForLoad(String sourceNodeId, long batchId, long rowNumber, Table table, CsvData data, String channelId) {
-        String rowData = CsvUtils.escapeCsvData(data.getCsvData(CsvData.ROW_DATA));
+        String rowData = data.getCsvData(CsvData.ROW_DATA);
+        // Replace all actual newlines and carriage returns with \n and \r strings
+        rowData = rowData.replaceAll("\n", "\\n").replaceAll("\r", "\\r");
+        rowData = CsvUtils.escapeCsvData(rowData);
         Node sourceNode = engine.getNodeService().findNode(sourceNodeId);
         String script = "try { engine.getDataService().sendMissingForeignKeyRowsForLoad(" + batchId + ", \""
                 + engine.getNodeId() + "\", " + rowNumber + ", " + rowData + "); } catch (Exception e) { }";