SYMMETRICDS-436

JumpMind · May 13, 2011 · 6789107 · 6789107
1 parent 0895c7f
commit 6789107
Show file tree

Hide file tree

Showing 6 changed files with 12 additions and 4 deletions.
diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/common/ParameterConstants.java
@@ -178,6 +178,8 @@ private ParameterConstants() {
     public final static String STATISTIC_RECORD_ENABLE = "statistic.record.enable";
 
     public final static String STORES_UPPERCASE_NAMES_IN_CATALOG = "stores.uppercase.names.in.catalog";
+
+    public final static String DB_MASTER_COLLATION = "db.master.collation";
 
     public static Map<String, ParameterMetaData> getParameterMetaData() {
         return parameterMetaData;

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/AbstractDbDialect.java
@@ -1548,5 +1548,9 @@ public String massageForLob(String sql, Channel channel) {
 
     public boolean escapesTemplatesForDatabaseInserts() {
         return false;
+    }
+
+    public String getMasterCollation() {
+        return parameterService.getString(ParameterConstants.DB_MASTER_COLLATION, "");
     }
 }

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/IDbDialect.java
@@ -304,5 +304,7 @@ public long insertWithGeneratedKey(JdbcTemplate jdbcTemplate, final String sql,
      * @return
      */
     public boolean escapesTemplatesForDatabaseInserts();
+
+    public String getMasterCollation();
 
 }

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/db/SqlTemplate.java
@@ -528,6 +528,8 @@ private ColumnString buildColumnString(String origTableAlias, String tableAlias,
                 String formattedColumnText = AppUtils.replace("columnName", String.format("%s%s", columnPrefix, column
                         .getName()), templateToUse);
 
+                formattedColumnText = AppUtils.replace("masterCollation", dbDialect.getMasterCollation(), formattedColumnText);
+
                 if (isLob) {
                     formattedColumnText = dbDialect.massageForLob(formattedColumnText, channel);
                 }

diff --git a/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/security/PasswordFactory.java b/symmetric/symmetric-core/src/main/java/org/jumpmind/symmetric/security/PasswordFactory.java
@@ -26,9 +26,7 @@
 import org.springframework.beans.factory.FactoryBean;
 
 /**
- * Used to protect database user and password from casual observation in the properties file
- *
- * 
+ * Used to protect database user and password from casual observation in the properties file
  */
 public class PasswordFactory implements FactoryBean<String> {
 

diff --git a/symmetric/symmetric-core/src/main/resources/org/jumpmind/symmetric/db/mssql.xml b/symmetric/symmetric-core/src/main/resources/org/jumpmind/symmetric/db/mssql.xml
@@ -9,7 +9,7 @@
     <bean id="msSqlStringTemplate" class="java.lang.String">
         <constructor-arg>
             <value>
-                <![CDATA[ case when $(tableAlias)."$(columnName)" is null then '' else '"' + replace(replace($(tableAlias)."$(columnName)",'\','\\'),'"','\"') + '"' end ]]>
+                <![CDATA[ case when $(tableAlias)."$(columnName)" is null then '' else '"' + replace(replace($(tableAlias)."$(columnName)" $(masterCollation),'\','\\'),'"','\"') + '"' end ]]>
             </value>
         </constructor-arg>
     </bean>