From 1513608c8233266ef39b9bb592413a0da16034f4 Mon Sep 17 00:00:00 2001
From: Chris Henson <chenson42@gmail.com>
Date: Mon, 3 Aug 2015 09:06:02 -0400
Subject: [PATCH] 0002359: Handle nvarchar default values on sql server that
 start with N' during schema creation

---
 .../main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java | 3 ++-
 .../java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java    | 3 +++
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java
index f60badd944..c30d1593ef 100644
--- a/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java
+++ b/symmetric-db/src/main/java/org/jumpmind/db/platform/AbstractDdlBuilder.java
@@ -2035,7 +2035,8 @@ protected void printDefaultValue(String defaultValue, int typeCode, StringBuilde
                 || defaultValueStr.toUpperCase().startsWith("TIME '")
                 || defaultValueStr.toUpperCase().startsWith("TIMESTAMP '")
                 || defaultValueStr.toUpperCase().startsWith("INTERVAL '")
-                ));
+                )) &&
+                !(defaultValueStr.toUpperCase().startsWith("N'") && defaultValueStr.endsWith("'"));
 
         if (shouldUseQuotes) {
             // characters are only escaped when within a string literal
diff --git a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java
index 0ca42d6f06..9dcae53922 100644
--- a/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java
+++ b/symmetric-jdbc/src/main/java/org/jumpmind/db/platform/mssql/MsSqlDdlReader.java
@@ -202,6 +202,9 @@ protected Column readColumn(DatabaseMetaDataWrapper metaData, Map<String, Object
                     defaultValue = defaultValue.substring(0, defaultValue.length() - 1);
                 }
             } else if (TypeMap.isTextType(column.getMappedTypeCode())) {
+                if (defaultValue.startsWith("N'") && defaultValue.endsWith("'")) {
+                    defaultValue = defaultValue.substring(2, defaultValue.length()-1);
+                }
                 defaultValue = unescape(defaultValue, "'", "''");
             }