Merge pull request lionheart#81 from gmc-dev/master

dlo · dlo · commit ad8455ce4958 · 2015-04-11T13:43:48.000-05:00
fixes lionheart#79
diff --git a/django_pyodbc/compiler.py b/django_pyodbc/compiler.py
@@ -338,7 +338,9 @@ def _alias_columns(self, sql):
                 buf = paren_buf.pop()
                 
                 # store the expanded paren string
+                buf = re.sub(r'%([^\(])', r'$$$\1', buf)
                 parens[key] = buf% parens
+                parens[key] = re.sub(r'\$\$\$([^\(])', r'%\1', parens[key])
                 #cannot use {} because IBM's DB2 uses {} as quotes
                 paren_buf[paren_depth] += '(%(' + key + ')s)'
             else:
