replacing identifier safe char " with [] enclosing for MsSQL

stamparm · stamparm · commit a51d8c4c7984 · 2012-06-13T15:27:42.000Z
diff --git a/lib/core/common.py b/lib/core/common.py
@@ -2733,11 +2733,13 @@ def safeSQLIdentificatorNaming(name, isTable=False):
         parts = name.split('.')
 
         for i in xrange(len(parts)):
-            if not re.match(r"\A[A-Za-z0-9_]+\Z", parts[i]):
+            if not re.match(r"\A[A-Za-z0-9_@\$]+\Z", parts[i]):  # reference: http://stackoverflow.com/questions/954884/what-special-characters-are-allowed-in-t-sql-column-name
                 if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
                     parts[i] = "`%s`" % parts[i].strip("`")
-                elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
+                elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
                     parts[i] = "\"%s\"" % parts[i].strip("\"")
+                elif Backend.getIdentifiedDbms() in (DBMS.MSSQL,):
+                    parts[i] = "[%s]" % parts[i].strip("[]")
 
         retVal = ".".join(parts)
 
@@ -2753,8 +2755,11 @@ def unsafeSQLIdentificatorNaming(name):
     if isinstance(name, basestring):
         if Backend.getIdentifiedDbms() in (DBMS.MYSQL, DBMS.ACCESS):
             retVal = name.replace("`", "")
-        elif Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
+        elif Backend.getIdentifiedDbms() in (DBMS.ORACLE, DBMS.PGSQL, DBMS.DB2):
             retVal = name.replace("\"", "")
+        elif Backend.getIdentifiedDbms() in (DBMS.MSSQL,):
+            retVal = name.replace("[", "").replace("]", "")
+
         if Backend.getIdentifiedDbms() in (DBMS.MSSQL, DBMS.SYBASE):
             prefix = "%s." % DEFAULT_MSSQL_SCHEMA
             if retVal.startswith(prefix):
