0001626: Create event should not store XML is row data

JumpMind · Apr 21, 2014 · ac1629e · ac1629e
1 parent 90015c5
commit ac1629e
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 4 deletions.
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
@@ -465,9 +465,7 @@ private void insertCreateBatchesForReload(Node targetNode, long loadId, String c
                     if (triggerRouter.getInitialLoadOrder() >= 0
                             && engine.getGroupletService().isTargetEnabled(triggerRouter,
                                     targetNode)) {
-                        String xml = symmetricDialect.getCreateTableXML(triggerHistory,
-                                triggerRouter);
-                        insertCreateEvent(transaction, targetNode, triggerHistory, xml, true,
+                        insertCreateEvent(transaction, targetNode, triggerHistory, null, true,
                                 loadId, createBy);
                         if (!transactional) {
                             transaction.commit();

diff --git a/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/writer/AbstractProtocolDataWriter.java b/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/writer/AbstractProtocolDataWriter.java
@@ -25,12 +25,15 @@
 import java.util.Map;
 
 import org.apache.commons.lang.StringUtils;
+import org.jumpmind.db.io.DatabaseXmlUtil;
 import org.jumpmind.db.model.Column;
+import org.jumpmind.db.model.Database;
 import org.jumpmind.db.model.Table;
 import org.jumpmind.db.util.BinaryEncoding;
 import org.jumpmind.symmetric.io.data.Batch;
 import org.jumpmind.symmetric.io.data.CsvConstants;
 import org.jumpmind.symmetric.io.data.CsvData;
+import org.jumpmind.symmetric.io.data.CsvUtils;
 import org.jumpmind.symmetric.io.data.DataContext;
 import org.jumpmind.symmetric.io.data.IDataWriter;
 import org.jumpmind.util.Statistics;
@@ -183,7 +186,16 @@ public void write(CsvData data) {
                     break;
 
                 case CREATE:
-                    println(CsvConstants.CREATE, data.getCsvData(CsvData.ROW_DATA));
+                    String xml = data.getCsvData(CsvData.ROW_DATA);
+                    if (StringUtils.isBlank(xml)) {
+                        Database db = new Database();
+                        db.setName("datawriter");
+                        db.setCatalog(table.getCatalog());
+                        db.setSchema(table.getSchema());
+                        db.addTable(table);
+                        xml = CsvUtils.escapeCsvData(DatabaseXmlUtil.toXml(db));
+                    }
+                    println(CsvConstants.CREATE, xml);
                     break;
 
                 case BSH: