diff options
Diffstat (limited to 'lib/sqlalchemy/sql')
| -rw-r--r-- | lib/sqlalchemy/sql/compiler.py | 11 | ||||
| -rw-r--r-- | lib/sqlalchemy/sql/expression.py | 2 |
2 files changed, 7 insertions, 6 deletions
diff --git a/lib/sqlalchemy/sql/compiler.py b/lib/sqlalchemy/sql/compiler.py index 6795c2fcd..94950b872 100644 --- a/lib/sqlalchemy/sql/compiler.py +++ b/lib/sqlalchemy/sql/compiler.py @@ -409,13 +409,14 @@ class DefaultCompiler(engine.Compiled): def _process_anon(self, match): (ident, derived) = match.group(1,2) - if ('anonymous', ident) in self.generated_ids: - return self.generated_ids[('anonymous', ident)] + key = ('anonymous', ident) + if key in self.generated_ids: + return self.generated_ids[key] else: - anonymous_counter = self.generated_ids.get('anonymous', 1) + anonymous_counter = self.generated_ids.get(('anon_counter', derived), 1) newname = derived + "_" + str(anonymous_counter) - self.generated_ids['anonymous'] = anonymous_counter + 1 - self.generated_ids[('anonymous', ident)] = newname + self.generated_ids[('anon_counter', derived)] = anonymous_counter + 1 + self.generated_ids[key] = newname return newname def _anonymize(self, name): diff --git a/lib/sqlalchemy/sql/expression.py b/lib/sqlalchemy/sql/expression.py index 732d4fdf9..ea8e067cd 100644 --- a/lib/sqlalchemy/sql/expression.py +++ b/lib/sqlalchemy/sql/expression.py @@ -1754,7 +1754,7 @@ class _BindParamClause(ClauseElement, _CompareMixin): self.key = "{ANON %d %s}" % (id(self), key or 'param') else: self.key = key or "{ANON %d param}" % id(self) - self._orig_key = key + self._orig_key = key or 'param' self.unique = unique self.value = value self.isoutparam = isoutparam |