diff options
| author | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-23 14:30:29 +0000 |
|---|---|---|
| committer | Russell Keith-Magee <russell@keith-magee.com> | 2010-04-23 14:30:29 +0000 |
| commit | 58c1a67ff1504d9368eb55461095f3a805b97ea7 (patch) | |
| tree | 23cdb29e34993c1215feb493fcba098670cf881d /django/db/models/sql/query.py | |
| parent | c8576fa674c4a252e258042de05b3f41cdec241a (diff) | |
[1.1.X] Fixed #11764 -- Added a missing set of parentheses in a call calculating the select_related tables. Thanks to aurelio for the report and original patch, and wogan for the updated patch.
Backport of r13019 from trunk.
git-svn-id: http://code.djangoproject.com/svn/django/branches/releases/1.1.X@13020 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/query.py')
| -rw-r--r-- | django/db/models/sql/query.py | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 131e97a438..4c473b6b7e 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -1380,8 +1380,8 @@ class BaseQuery(object): lhs_col = int_opts.parents[int_model].column dedupe = lhs_col in opts.duplicate_targets if dedupe: - avoid.update(self.dupe_avoidance.get(id(opts), lhs_col), - ()) + avoid.update(self.dupe_avoidance.get((id(opts), lhs_col), + ())) dupe_set.add((opts, lhs_col)) int_opts = int_model._meta alias = self.join((alias, int_opts.db_table, lhs_col, |