From 8793fbc9f53f4bc3d56d67d8f319fa1b8be6c5ed Mon Sep 17 00:00:00 2001
From: Miroslav Stampar <miroslav.stampar@gmail.com>
Date: Wed, 14 Dec 2011 12:59:25 +0000
Subject: [PATCH] minor update

---
 lib/core/common.py                 | 2 ++
 plugins/dbms/mssqlserver/syntax.py | 2 +-
 2 files changed, 3 insertions(+), 1 deletion(-)

diff --git a/lib/core/common.py b/lib/core/common.py
index ac601d4b9..cc9ab197b 100644
--- a/lib/core/common.py
+++ b/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)
 
diff --git a/plugins/dbms/mssqlserver/syntax.py b/plugins/dbms/mssqlserver/syntax.py
index 0998e6170..7121f409c 100644
--- a/plugins/dbms/mssqlserver/syntax.py
+++ b/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 += "+"