minor update

This commit is contained in:
Miroslav Stampar 2011-12-14 12:59:25 +00:00
parent 1fd1ec22a1
commit 8793fbc9f5
2 changed files with 3 additions and 1 deletions

View File

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

View File

@ -35,7 +35,7 @@ class Syntax(GenericSyntax):
unescaped = "" unescaped = ""
for i in xrange(firstIndex, lastIndex): 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: if i < lastIndex - 1:
unescaped += "+" unescaped += "+"