From 6cf4db7df37e56b700e363b66ab82f5921d1434b Mon Sep 17 00:00:00 2001 From: Mike Bayer Date: Tue, 23 Dec 2008 01:22:54 +0000 Subject: - Columns can again contain percent signs within their names. [ticket:1256] --- lib/sqlalchemy/sql/compiler.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'lib/sqlalchemy/sql') diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 921d932d2..39e3dbfd7 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -407,11 +407,12 @@ class DefaultCompiler(engine.Compiled): return bind_name + _trunc_re = re.compile(r'%\((\d+ \w+)\)s', re.U) def _truncated_identifier(self, ident_class, name): if (ident_class, name) in self.truncated_names: return self.truncated_names[(ident_class, name)] - - anonname = name % self.anon_map + + anonname = self._trunc_re.sub(lambda m: self.anon_map[m.group(1)], name) if len(anonname) > self.label_length: counter = self.truncated_names.get(ident_class, 1) -- cgit v1.2.1