From 58c1a67ff1504d9368eb55461095f3a805b97ea7 Mon Sep 17 00:00:00 2001 From: Russell Keith-Magee Date: Fri, 23 Apr 2010 14:30:29 +0000 Subject: [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 --- django/db/models/sql/query.py | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'django/db/models/sql/query.py') 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, -- cgit v1.3