0004552: Transforms break deletes when transforming primary key column

and not capturing old data as specified in trigger
JumpMind · Sep 16, 2020 · 4a598cb · 4a598cb
1 parent 1dc9f48
commit 4a598cb
Show file tree

Hide file tree

Showing 12 changed files with 30 additions and 12 deletions.
diff --git a/...etric-core/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java b/...etric-core/src/main/java/org/jumpmind/symmetric/io/data/transform/BshColumnTransform.java
@@ -152,7 +152,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
 
             if (result instanceof String) {
-                if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+                if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
                     return new NewAndOldValue(null, (String) result);
                 } else {
                     return new NewAndOldValue((String) result, null);

diff --git a/...ic-core/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java b/...ic-core/src/main/java/org/jumpmind/symmetric/io/data/transform/LookupColumnTransform.java
@@ -108,7 +108,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
                     column.getTargetColumnName(), column.getTransformId());
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, lookupValue);
         } else {
             return new NewAndOldValue(lookupValue, null);

diff --git a/...core/src/main/java/org/jumpmind/symmetric/io/data/transform/ParameterColumnTransform.java b/...core/src/main/java/org/jumpmind/symmetric/io/data/transform/ParameterColumnTransform.java
@@ -60,7 +60,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             value = parameterService.getString(paramName);
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

diff --git a/...-core/src/main/java/org/jumpmind/symmetric/io/data/transform/VariableColumnTransform.java b/...-core/src/main/java/org/jumpmind/symmetric/io/data/transform/VariableColumnTransform.java
@@ -137,7 +137,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

diff --git a/...o/src/integrationTest/java/org/jumpmind/symmetric/io/data/writer/TransformWriterTest.java b/...o/src/integrationTest/java/org/jumpmind/symmetric/io/data/writer/TransformWriterTest.java
@@ -105,6 +105,20 @@ public void testUpdateActionBeanShellScript() throws Exception {
         Assert.assertEquals(DataEventType.UPDATE, datas.get(2).getDataEventType());
         Assert.assertEquals(DataEventType.UPDATE, datas.get(3).getDataEventType());
     }
+
+    @Test
+    public void testDeleteNoCaptureOldData() throws Exception {
+        mockWriter.reset();
+        Table table = new Table("s4", new Column("id"));
+        writeData(getTransformWriter(), new TableCsvData(table,
+                new CsvData(DataEventType.DELETE, new String[] {"1"}, null)));
+        List<CsvData> datas = mockWriter.writtenDatas.get("t4");
+        Assert.assertEquals(1, datas.size());
+        Assert.assertEquals(DataEventType.DELETE, datas.get(0).getDataEventType());
+        String[] pkData = datas.get(0).getParsedData(CsvData.PK_DATA);
+        Assert.assertEquals(1, pkData.length);
+        Assert.assertEquals("1", pkData[0]);
+    }
 
 
     @Test
@@ -124,6 +138,9 @@ public void testIgnoreRowExceptionFromBshMapping() throws Exception {
     }
 
     protected TransformWriter getTransformWriter() {
+        TransformTable transformTable4 =
+           new TransformTable("s4", "t4", TransformPoint.LOAD,
+                   new TransformColumn("id", "id", true, "const", "1"));
         TransformTable transformTable3 =
            new TransformTable("s3", "t3", TransformPoint.LOAD, new TransformColumn("id", "id", true));
         transformTable3.setUpdateAction("switch (id) { case \"1\": return \"INS_ROW\"; case \"2\": "
@@ -133,7 +150,8 @@ protected TransformWriter getTransformWriter() {
                 new TransformTable("s1", "t1", TransformPoint.LOAD, new TransformColumn("id", "id", true)),
                 new TransformTable("s2", "t2", TransformPoint.LOAD, new TransformColumn("id", "id", true),
                    new TransformColumn(null, "col2", false, "const", "added")),
-                transformTable3
+                transformTable3,
+                transformTable4
         });
     }
 

diff --git a/...-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BinaryLeftColumnTransform.java b/...-io/src/main/java/org/jumpmind/symmetric/io/data/transform/BinaryLeftColumnTransform.java
@@ -57,7 +57,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, newValue);
         } else {
             return new NewAndOldValue(newValue, null);

diff --git a/...rc/main/java/org/jumpmind/symmetric/io/data/transform/ClarionDateTimeColumnTransform.java b/...rc/main/java/org/jumpmind/symmetric/io/data/transform/ClarionDateTimeColumnTransform.java
@@ -60,7 +60,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
         }
         String value = convertClarionDate(newValue, clarionTimeStr);
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

diff --git a/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/transform/ConstantColumnTransform.java b/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/transform/ConstantColumnTransform.java
@@ -49,7 +49,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             TransformColumn column, TransformedData data, Map<String, String> sourceValues,
             String newValue, String oldValue) throws IgnoreColumnException, IgnoreRowException {
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, column.getTransformExpression());
         } else {
             return new NewAndOldValue(column.getTransformExpression(), null);

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IsNullTransform.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/IsNullTransform.java
@@ -35,7 +35,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LeftColumnTransform.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/LeftColumnTransform.java
@@ -62,7 +62,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

diff --git a/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/MathColumnTransform.java b/symmetric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/MathColumnTransform.java
@@ -73,7 +73,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
                 result = result.substring(0, result.length()-2);
             }
 
-            if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+            if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
                 return new NewAndOldValue(null, result);
             } else {
                 return new NewAndOldValue(result, null);

diff --git a/...tric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/SubstrColumnTransform.java b/...tric-io/src/main/java/org/jumpmind/symmetric/io/data/transform/SubstrColumnTransform.java
@@ -75,7 +75,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
             }
         }
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && !column.isPk()) {
             return new NewAndOldValue(null, newValue);
         } else {
             return new NewAndOldValue(newValue, null);