From 385ae343fbd2355a09ba0f459445bf04406db60b Mon Sep 17 00:00:00 2001 From: Luke Plant Date: Sat, 7 May 2011 19:02:51 +0000 Subject: Fixed #15709 - Duplicated group_by condition Thanks to ziangsong for report, and to mk for the patch git-svn-id: http://code.djangoproject.com/svn/django/trunk@16180 bcc190cf-cafb-0310-a4f2-bffc1f526a37 --- django/db/models/sql/compiler.py | 4 ++++ 1 file changed, 4 insertions(+) (limited to 'django/db/models/sql') diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index ace9cf4c88..841ec12f2d 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -493,7 +493,11 @@ class SQLCompiler(object): params.extend(extra_params) cols = (group_by + self.query.select + self.query.related_select_cols + extra_selects) + seen = set() for col in cols: + if col in seen: + continue + seen.add(col) if isinstance(col, (list, tuple)): result.append('%s.%s' % (qn(col[0]), qn(col[1]))) elif hasattr(col, 'as_sql'): -- cgit v1.3