0006231: fix uninstall of older sym installation

JumpMind · Feb 14, 2024 · d45c45f · d45c45f
1 parent 28a1e09
commit d45c45f
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 25 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
@@ -153,8 +153,7 @@ public List<Trigger> getTriggers() {
     }
 
     public List<Trigger> getTriggers(boolean replaceTokens) {
-        List<Trigger> triggers = sqlTemplate.query("select "
-                + getSql("selectTriggersColumnList", "selectTriggersSql"), new TriggerMapper());
+        List<Trigger> triggers = sqlTemplate.query(getSql("selectTriggersSql"), new TriggerMapper());
         if (replaceTokens) {
             @SuppressWarnings({ "rawtypes", "unchecked" })
             Map<String, String> replacements = (Map) parameterService.getAllParameters();
@@ -1377,9 +1376,7 @@ public void saveTrigger(Trigger trigger) {
 
     public void saveTriggerAsCopy(String originalId, Trigger trigger) {
         String newId = trigger.getTriggerId();
-        List<Trigger> triggers = sqlTemplate.query(
-                "select " + getSql("selectTriggersColumnList", "selectTriggersWhereTriggerIdLikeSql"),
-                new TriggerMapper(), newId + "%");
+        List<Trigger> triggers = sqlTemplate.query(getSql("selectTriggersWhereTriggerIdLikeSql"), new TriggerMapper(), newId + "%");
         List<String> ids = triggers.stream().map(Trigger::getTriggerId).collect(Collectors.toList());
         String suffix = "";
         for (int i = 2; ids.contains(newId + suffix); i++) {
@@ -2799,13 +2796,15 @@ public Trigger mapRow(Row rs) {
             }
             trigger.setChannelExpression(rs.getString("channel_expression"));
             trigger.setTxIdExpression(rs.getString("tx_id_expression"));
-            trigger.setCreateTime(rs.getDateTime("t_create_time"));
-            trigger.setLastUpdateTime(rs.getDateTime("t_last_update_time"));
-            trigger.setLastUpdateBy(rs.getString("t_last_update_by"));
+            trigger.setCreateTime(rs.getDateTime("create_time"));
+            trigger.setLastUpdateTime(rs.getDateTime("last_update_time"));
+            trigger.setLastUpdateBy(rs.getString("last_update_by"));
             trigger.setExcludedColumnNames(rs.getString("excluded_column_names"));
             trigger.setIncludedColumnNames(rs.getString("included_column_names"));
             trigger.setSyncKeyNames(rs.getString("sync_key_names"));
-            trigger.setTimeBasedCaptureColumn(rs.getString("time_based_column_name"));
+            if (rs.containsKey("time_based_column_name")) {
+                trigger.setTimeBasedCaptureColumn(rs.getString("time_based_column_name"));
+            }
             return trigger;
         }
     }

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
@@ -51,9 +51,9 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform,
 
         putSql("inactivateTriggerHistorySql", "update $(trigger_hist) set inactive_time = ?, error_message = ? where trigger_hist_id = ?");
 
-        putSql("selectTriggersSql", "" + "from $(trigger) t order by trigger_id asc   ");
+        putSql("selectTriggersSql", "select * from $(trigger) order by trigger_id asc");
 
-        putSql("selectTriggersWhereTriggerIdLikeSql", "" + "from $(trigger) t where trigger_id like ?   ");
+        putSql("selectTriggersWhereTriggerIdLikeSql", "select * from $(trigger) where trigger_id like ?");
 
         putSql("selectTriggerRoutersSql", ""
                 + "from $(trigger_router) tr                                 "
@@ -69,20 +69,6 @@ public TriggerRouterServiceSqlMap(IDatabasePlatform platform,
                         + "  r.target_catalog_name,r.source_node_group_id,r.target_schema_name,r.target_table_name,r.target_node_group_id,r.router_expression,        "
                         + "  r.router_type,r.router_id,r.create_time as r_create_time,r.last_update_time as r_last_update_time,r.last_update_by as r_last_update_by, "
                         + "  r.use_source_catalog_schema ");
-
-        putSql("selectTriggersColumnList",
-                ""
-                        + "  t.trigger_id,t.channel_id,t.reload_channel_id,t.source_table_name,t.source_schema_name,t.source_catalog_name,        "
-                        + "  t.sync_on_insert,t.sync_on_update,t.sync_on_delete,t.sync_on_incoming_batch,t.use_stream_lobs,   "
-                        + "  t.use_capture_lobs,t.use_capture_old_data,t.use_handle_key_updates,                              "
-                        + "  t.excluded_column_names, t.included_column_names, t.sync_key_names,                              "
-                        + "  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.time_based_column_name, " 
-                        + "  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                   ");
 
         putSql("selectTriggerHistIdSql", "select trigger_hist_id from $(trigger_hist) ");