0001149: Log error message when an invalid sync_key_name column is sp…

…ecified. If no columns match, then return the original keys.
JumpMind · Mar 29, 2013 · de79485 · de79485
1 parent 119f063
commit de79485
Showing 1 changed file with 9 additions and 2 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/model/Trigger.java
@@ -43,7 +43,7 @@ public class Trigger implements Serializable {
 
     private static final long serialVersionUID = 1L;
 
-    static final Logger logger = LoggerFactory.getLogger(Trigger.class);
+    static final Logger log = LoggerFactory.getLogger(Trigger.class);
 
     private static int maxTriggerId;
 
@@ -159,9 +159,16 @@ public Column[] getSyncKeysColumnsForTable(Table table) {
                 Column col = table.getColumnWithName(syncKey);
                 if (col != null) {
                     columns.add(col);
+                } else {
+                    log.error("The sync key column '{}' was specified for the '{}' trigger but was not found in the table", syncKey, triggerId);
                 }
             }
-            return columns.toArray(new Column[columns.size()]);
+
+            if (columns.size() > 0) {
+                return columns.toArray(new Column[columns.size()]);
+            } else {
+                return table.getPrimaryKeyColumns();
+            }
         } else {
             return table.getPrimaryKeyColumns();
         }