0003478: Sync triggers in MySQL will fail if there is an active trigger

history record but the table was removed manually
JumpMind · Mar 7, 2018 · 0e834c9 · 0e834c9
1 parent dddf5fd
commit 0e834c9
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java b/symmetric-client/src/main/java/org/jumpmind/symmetric/db/mysql/MySqlSymmetricDialect.java
@@ -163,7 +163,7 @@ protected boolean doesTriggerExistOnPlatform(String catalog, String schema, Stri
     public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String schemaName,
             String triggerName, String tableName, ISqlTransaction transaction) {
         catalogName = catalogName == null ? "" : (catalogName + ".");
-        final String sql = "drop trigger " + catalogName + triggerName;
+        final String sql = "drop trigger if exists " + catalogName + triggerName;
         logSql(sql, sqlBuffer);
         if (parameterService.is(ParameterConstants.AUTO_SYNC_TRIGGERS)) {
             transaction.execute(sql);

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
@@ -1374,7 +1374,7 @@ protected void dropTriggers(TriggerHistory history, StringBuilder sqlBuffer) {
             } else {
                 inactivateTriggerHistory(history);
             }
-        } catch (Error ex) {
+        } catch (Throwable ex) {
             log.error("Error while dropping triggers for table %s", history.getSourceTableName(), ex);
         }
     }