From 5e3a2e2f3956f358b5e82e217c20bb0b36fb0665 Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Mon, 8 Mar 2010 12:47:16 +0000 Subject: Fixed #12240 - select_related doesn't work correctly when mixing nullable and non-nullable keys Thanks to embe for report and Alex for fix. git-svn-id: http://code.djangoproject.com/svn/django/trunk@12719 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/compiler.py | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) (limited to 'django/db/models/sql/compiler.py') diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index f364b1de82..b7d63d381e 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -530,10 +530,7 @@ class SQLCompiler(object): avoid = avoid_set.copy() dupe_set = orig_dupe_set.copy() table = f.rel.to._meta.db_table - if nullable or f.null: - promote = True - else: - promote = False + promote = nullable or f.null if model: int_opts = opts alias = root_alias @@ -584,10 +581,7 @@ class SQLCompiler(object): next = requested.get(f.name, {}) else: next = False - if f.null is not None: - new_nullable = f.null - else: - new_nullable = None + new_nullable = f.null or promote for dupe_opts, dupe_col in dupe_set: self.query.update_dupe_avoidance(dupe_opts, dupe_col, alias) self.fill_related_selections(f.rel.to._meta, alias, cur_depth + 1, -- cgit v1.3