0004470: Database name with special character like minus sign, fails to

create trigger
JumpMind · Sep 4, 2020 · ee78c33 · ee78c33
1 parent 682054e
commit ee78c33
Showing 1 changed file with 12 additions and 4 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
@@ -175,13 +175,21 @@ protected boolean doesTriggerExistOnPlatform(String catalog, String schema, Stri
     @Override
     public void removeTrigger(StringBuilder sqlBuffer, String catalogName, String schemaName,
             String triggerName, String tableName, ISqlTransaction transaction) {
-        if (catalogName == null || platform.getDefaultCatalog().equals(catalogName)) {
+        boolean ignoreCase =
+                parameterService.is(ParameterConstants.DB_METADATA_IGNORE_CASE);
+        if (catalogName == null ||
+                (ignoreCase && catalogName.equalsIgnoreCase(platform.getDefaultCatalog())) ||
+                (!ignoreCase && catalogName.equals(platform.getDefaultCatalog())))
+        {
             catalogName = "";
         } else {
-            if (parameterService.is(ParameterConstants.DB_METADATA_IGNORE_CASE)) {
-                catalogName = platform.alterCaseToMatchDatabaseDefaultCase(catalogName);
+            if (ignoreCase) {
+                catalogName =
+                        platform.alterCaseToMatchDatabaseDefaultCase(catalogName);
             }
-            catalogName = platform.getDatabaseInfo().getDelimiterToken() + catalogName + platform.getDatabaseInfo().getDelimiterToken() + ".";
+            catalogName =
+                    platform.getDatabaseInfo().getDelimiterToken() + catalogName +
+                    platform.getDatabaseInfo().getDelimiterToken() + ".";
         }
         final String sql = "drop trigger if exists " + catalogName + triggerName;
         logSql(sql, sqlBuffer);