0004932: Transforms break deletes when primary key columns are

transformed because of issue 4552
JumpMind · Mar 31, 2021 · 4e73dcb · 4e73dcb
1 parent efdcfc9
commit 4e73dcb
Show file tree

Hide file tree

Showing 12 changed files with 12 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) && !column.isPk()) {
+                if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
                     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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);

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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             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) && !column.isPk()) {
+            if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
                 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) && !column.isPk()) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             return new NewAndOldValue(null, newValue);
         } else {
             return new NewAndOldValue(newValue, null);

diff --git a/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/transform/ValueMapColumnTransform.java b/...ic-io/src/main/java/org/jumpmind/symmetric/io/data/transform/ValueMapColumnTransform.java
@@ -82,7 +82,7 @@ public NewAndOldValue transform(IDatabasePlatform platform,
 
         String value = getValue(newValue,column.getTransformExpression());
 
-        if (data.getTargetDmlType().equals(DataEventType.DELETE)) {
+        if (data.getTargetDmlType().equals(DataEventType.DELETE) && data.getOldSourceValues() != null) {
             return new NewAndOldValue(null, value);
         } else {
             return new NewAndOldValue(value, null);