SYMMETRICDS-462 - refactor transformer

JumpMind · Jun 28, 2011 · 1d01dee · 1d01dee
1 parent 71a25c8
commit 1d01dee
Showing 1 changed file with 14 additions and 7 deletions.
diff --git a/...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/TransformDataLoader.java b/...ic/symmetric-core/src/main/java/org/jumpmind/symmetric/transform/TransformDataLoader.java
@@ -68,17 +68,18 @@ protected boolean transform(DmlType dmlType, IDataLoaderContext context, String[
     protected boolean perform(TransformedData data, TransformTable transformation,
             Map<String, String> originalValues) {
         boolean persistData = false;
+
+        for (String columnName : originalValues.keySet()) {
+            List<TransformColumn> transformColumns = transformation.getTransformColumnFor(columnName);
+            for (TransformColumn transformColumn : transformColumns) {
+                transformColumn(data, transformColumn, originalValues, false);
+            }
+        }
+
         if (data.getTargetDmlType() != DmlType.DELETE) {
             if (data.getTargetDmlType() == DmlType.INSERT && transformation.isUpdateFirst()) {
                 data.setTargetDmlType(DmlType.UPDATE);
             }
-            for (String columnName : originalValues.keySet()) {
-                List<TransformColumn> transformColumns = transformation.getTransformColumnFor(columnName);
-                for (TransformColumn transformColumn : transformColumns) {
-                    transformColumn(data, transformColumn, originalValues, false);
-                }
-            }
-
             persistData = true;
         } else {
             // handle the delete action
@@ -134,11 +135,17 @@ public void apply(IDataLoaderContext context, TransformedData data) {
             try {
                 tableTemplate.insert(context, data.getColumnValues());
             } catch (DataIntegrityViolationException ex) {
+                data.setTargetDmlType(DmlType.UPDATE);
+                tableTemplate.setColumnNames(data.getColumnNames());
+                tableTemplate.setKeyNames(data.getKeyNames());
                 tableTemplate.update(context, data.getColumnValues(), data.getKeyValues());
             }
             break;
         case UPDATE:
             if (0 == tableTemplate.update(context, data.getColumnValues(), data.getKeyValues())) {
+                data.setTargetDmlType(DmlType.INSERT);
+                tableTemplate.setColumnNames(data.getColumnNames());
+                tableTemplate.setKeyNames(data.getKeyNames());
                 tableTemplate.insert(context, data.getColumnValues());
             }
             break;