sometimes sql task should not do replacement

JumpMind · Jan 3, 2008 · 62398c3 · 62398c3
1 parent e243bd8
commit 62398c3
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 3 deletions.
diff --git a/symmetric/src/main/java/org/jumpmind/symmetric/upgrade/SqlUpgradeTask.java b/symmetric/src/main/java/org/jumpmind/symmetric/upgrade/SqlUpgradeTask.java
@@ -39,6 +39,8 @@ public class SqlUpgradeTask implements IUpgradeTask {
     protected boolean isUpgradeRegistrationServer = true;
 
     protected boolean isUpgradeNonRegistrationServer = true;
+
+    protected boolean useReplacement = true;
 
     public void upgrade(int[] fromVersion) {
         for (String sql : sqlList) {
@@ -49,10 +51,12 @@ public void upgrade(int[] fromVersion) {
 
     public void upgrade(Node node, int[] fromVersion) {
         for (String sql : sqlList) {
+            if (useReplacement) {
+                sql = replace("groupId", node.getNodeGroupId(), sql);
+                sql = replace("externalId", node.getExternalId(), sql);
+                sql = replace("nodeId", node.getNodeId(), sql);
+            }
             logger.debug("upgrade->" + sql);
-            sql = replace("groupId", node.getNodeGroupId(), sql);
-            sql = replace("externalId", node.getExternalId(), sql);
-            sql = replace("nodeId", node.getNodeId(), sql);
             jdbcTemplate.update(sql);
         }
     }
@@ -93,4 +97,12 @@ public void setUpgradeRegistrationServer(boolean isUpgradeRegistrationServer) {
         this.isUpgradeRegistrationServer = isUpgradeRegistrationServer;
     }
 
+    public boolean getUseReplacement() {
+        return useReplacement;
+    }
+
+    public void setUseReplacement(boolean useReplacement) {
+        this.useReplacement = useReplacement;
+    }
+
 }
diff --git a/symmetric/src/main/resources/symmetric-upgrade.xml b/symmetric/src/main/resources/symmetric-upgrade.xml
@@ -62,6 +62,7 @@
     <!-- Changes made in version 1.2 -->
     <bean id="changes1.2" class="org.jumpmind.symmetric.upgrade.SqlUpgradeTask">
         <property name="jdbcTemplate" ref="jdbcTemplate" />
+        <property name="useReplacement" value="false" />
         <property name="sqlList">
             <list>
                 <value>