get rid of left over crud

JumpMind · May 19, 2011 · c256cdd · c256cdd
1 parent db3e944
commit c256cdd
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 9 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/StatementBuilder.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/load/StatementBuilder.java
@@ -37,7 +37,7 @@
 public class StatementBuilder {
 
     public enum DmlType {
-        INSERT, UPDATE, DELETE, UPDATE_NO_KEYS, COUNT
+        INSERT, UPDATE, DELETE, COUNT
     };
 
     protected DmlType dmlType;
@@ -66,10 +66,6 @@ public StatementBuilder(DmlType type, String tableName, Column[] keys, Column[]
         } else if (type == DmlType.UPDATE) {
             sql = buildUpdateSql(tableName, keys, columns);
             types = buildTypes(keys, columns, isDateOverrideToTimestamp);
-        } else if (type == DmlType.UPDATE_NO_KEYS) {
-            columns = removeKeysFromColumns(keys, columns);
-            sql = buildUpdateSql(tableName, keys, columns);
-            types = buildTypes(keys, columns, isDateOverrideToTimestamp);
         } else if (type == DmlType.DELETE) {
             sql = buildDeleteSql(tableName, keys);
             types = buildTypes(keys, isDateOverrideToTimestamp);
@@ -247,7 +243,6 @@ public Column[] getColumnKeyMetaData(boolean prefiltered) {
     public Column[] getMetaData(boolean prefiltered) {
         switch (dmlType) {
         case UPDATE:
-        case UPDATE_NO_KEYS:
             return getColumnKeyMetaData(prefiltered);
         case INSERT:
             return getColumns();

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Data.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Data.java
@@ -214,6 +214,17 @@ public Date getCreateTime() {
 
     public void setCreateTime(Date createTime) {
         this.createTime = createTime;
+    }
+
+    public String getPkDataFor(String columnName) {
+        String[] pkData = toParsedPkData();
+        String[] keyNames = triggerHistory.getParsedPkColumnNames();
+        for (int i = 0; i < keyNames.length; i++) {
+            if (columnName.equals(keyNames[i])) {
+                return pkData[i];
+            }            
+        }
+        return null;
     }
 
 }

diff --git a/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/RemoveColumnsFilter.java b/symmetric/symmetric-server/src/main/java/org/jumpmind/symmetric/map/RemoveColumnsFilter.java
@@ -95,9 +95,6 @@ public String[] filterColumnsNames(IDataLoaderContext ctx, DmlType dml, Table ta
             for (String col : columnNames) {
                 if (ArrayUtils.contains(columnsToRemove, col)) {
                     Integer putValue = index;
-                    if (dml.equals(DmlType.UPDATE_NO_KEYS)) {
-                        putValue = index - 1;
-                    }
                     if (columnIndex.get(dml) == null) {
                         columnIndex.put(dml, new ArrayList<Integer>());
                     }