Permalink
Browse files

Cleaned up the ORM slightly.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@15203 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
1 parent 7916c75 commit 92d43522839fd9ec945d8c018de78770bec04ee1 @alex alex committed Jan 14, 2011
Showing with 7 additions and 7 deletions.
  1. +7 −7 django/db/models/sql/query.py
@@ -1212,11 +1212,10 @@ def setup_joins(self, names, opts, alias, dupe_multis, allow_many=True,
dupe_set = set()
exclusions = set()
extra_filters = []
+ int_alias = None
for pos, name in enumerate(names):
- try:
+ if int_alias is not None:
exclusions.add(int_alias)
- except NameError:
- pass
exclusions.add(alias)
last.append(len(joins))
if name == 'pk':
@@ -1375,10 +1374,11 @@ def setup_joins(self, names, opts, alias, dupe_multis, allow_many=True,
joins.append(alias)
for (dupe_opts, dupe_col) in dupe_set:
- try:
- self.update_dupe_avoidance(dupe_opts, dupe_col, int_alias)
- except NameError:
- self.update_dupe_avoidance(dupe_opts, dupe_col, alias)
+ if int_alias is None:
+ to_avoid = alias
+ else:
+ to_avoid = int_alias
+ self.update_dupe_avoidance(dupe_opts, dupe_col, to_avoid)
if pos != len(names) - 1:
if pos == len(names) - 2:

0 comments on commit 92d4352

Please sign in to comment.