Strip out special characters from trigger_ids when generating trigger…

… names.
JumpMind · Sep 11, 2010 · 6b5f5f8 · 6b5f5f8
1 parent 769a983
commit 6b5f5f8
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 11 deletions.
diff --git a/.../symmetric-ds/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java b/.../symmetric-ds/src/main/java/org/jumpmind/symmetric/service/impl/TriggerRouterService.java
@@ -804,18 +804,16 @@ protected String getTriggerName(DataEventType dml, int maxTriggerNameLength, Tri
         if (StringUtils.isBlank(triggerName)) {
             String triggerPrefix1 = tablePrefix + "_";
             String triggerSuffix1 = "on_" + dml.getCode().toLowerCase() + "_for_";
-            String triggerSuffix2 = replaceCharsForTriggerName(trigger.getTriggerId() + "_"
-                    + parameterService.getNodeGroupId());
-            triggerName = triggerPrefix1 + triggerSuffix1 + triggerSuffix2;
+            String triggerSuffix2 = replaceCharsForTriggerName(trigger.getTriggerId());
+            String triggerSuffix3 = replaceCharsForTriggerName("_" + parameterService.getNodeGroupId());
+            triggerName = triggerPrefix1 + triggerSuffix1 + triggerSuffix2 + triggerSuffix3;
             // use the node group id as part of the trigger if we can because it
-            // helps uniquely identify
-            // the trigger in embedded databases. In hsqldb we choose the
-            // correct connection based on the presence of
-            // a table that is named for the trigger. If the trigger isn't
-            // unique across all databases, then we can
+            // helps uniquely identify the trigger in embedded databases. In hsqldb we choose the
+            // correct connection based on the presence of a table that is named for the trigger. 
+            // If the trigger isn't unique across all databases, then we can
             // choose the wrong connection.
             if (triggerName.length() > maxTriggerNameLength && maxTriggerNameLength > 0) {
-                triggerName = triggerPrefix1 + triggerSuffix1;
+                triggerName = triggerPrefix1 + triggerSuffix1 + triggerSuffix2;
             }
         }
 

diff --git a/symmetric/symmetric-ds/src/test/resources/symmetric-test.properties b/symmetric/symmetric-ds/src/test/resources/symmetric-test.properties
@@ -1,5 +1,5 @@
-test.root=h2
-test.client=h2
+test.root=db2
+test.client=db2
 
 mysql.db.driver=com.mysql.jdbc.Driver
 mysql.db.user=root