0003171: Trigger Rebuild: custom_before_insert_text is ignored when r…

…ebuilding triggers Added functionality to triggerMapper to look for the three "before" columns
JumpMind · Jun 23, 2020 · afd414c · afd414c
1 parent e32815a
commit afd414c
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 0 deletions.
diff --git a/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/symmetric-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -2125,6 +2125,19 @@ public Trigger mapRow(Row rs) {
             if (!StringUtils.isBlank(text)) {
                 trigger.setCustomOnDeleteText(text);
             }
+
+            text = rs.getString("custom_before_insert_text");
+            if (!StringUtils.isBlank(text)) {
+                trigger.setCustomBeforeInsertText(text);
+            }
+            text = rs.getString("custom_before_update_text");
+            if (!StringUtils.isBlank(text)) {
+                trigger.setCustomBeforeUpdateText(text);
+            }
+            text = rs.getString("custom_before_delete_text");
+            if (!StringUtils.isBlank(text)) {
+                trigger.setCustomBeforeDeleteText(text);
+            }
 
             condition = rs.getString("external_select");
             if (!StringUtils.isBlank(condition)) {

diff --git a/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java b/...ic-core/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterServiceSqlMap.java
@@ -79,6 +79,7 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform,
                         + "  t.name_for_delete_trigger,t.name_for_insert_trigger,t.name_for_update_trigger,                   "
                         + "  t.sync_on_insert_condition,t.sync_on_update_condition,t.sync_on_delete_condition,                "
                         + "  t.custom_on_insert_text,t.custom_on_update_text,t.custom_on_delete_text,                               "
+                        + "  t.custom_before_insert_text,t.custom_before_update_text,t.custom_before_delete_text,             "
                         + "  t.tx_id_expression,t.external_select,t.channel_expression, t.stream_row,              " 
                         + "  t.create_time as t_create_time,                             "
                         + "  t.last_update_time as t_last_update_time, t.last_update_by as t_last_update_by                   ");