minor update

lib/core/common.py

@@ -2824,6 +2824,8 @@ def safeSQLIdentificatorNaming(name, isTable=False):
     retVal = name
 
     if isinstance(name, basestring):
+        name = getUnicode(name)
+
         if isTable and Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE) and '.' not in name:
             name = "%s.%s" % (DEFAULT_MSSQL_SCHEMA, name)
 

plugins/dbms/mssqlserver/syntax.py

@@ -35,7 +35,7 @@ class Syntax(GenericSyntax):
                 unescaped = ""
 
                 for i in xrange(firstIndex, lastIndex):
-                    unescaped += "CHAR(%d)" % (ord(expression[i]))
+                    unescaped += "%s(%d)" % ("CHAR" if ord(expression[i]) < 256 else "NCHAR", ord(expression[i]))
                     if i < lastIndex - 1:
                         unescaped += "+"