diff options
| author | Justin Bronn <jbronn@gmail.com> | 2010-02-23 04:39:39 +0000 |
|---|---|---|
| committer | Justin Bronn <jbronn@gmail.com> | 2010-02-23 04:39:39 +0000 |
| commit | 6ed7bd5609d298858c02d5d3b6357b434df06d9f (patch) | |
| tree | fd8ddc1916fa72fcf59a974dd9a47fd7925f7ba1 /django/db/models/sql/compiler.py | |
| parent | c1d795df454b9f6500d3b704e68bddd10f0e17eb (diff) | |
Fixed #12855 -- QuerySets with `extra` where parameters now combine correctly. Thanks, Alex Gaynor.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@12502 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql/compiler.py')
| -rw-r--r-- | django/db/models/sql/compiler.py | 7 |
1 files changed, 0 insertions, 7 deletions
diff --git a/django/db/models/sql/compiler.py b/django/db/models/sql/compiler.py index 1625a0e6c9..f364b1de82 100644 --- a/django/db/models/sql/compiler.py +++ b/django/db/models/sql/compiler.py @@ -84,12 +84,6 @@ class SQLCompiler(object): if where: result.append('WHERE %s' % where) params.extend(w_params) - if self.query.extra_where: - if not where: - result.append('WHERE') - else: - result.append('AND') - result.append(' AND '.join(self.query.extra_where)) grouping, gb_params = self.get_grouping() if grouping: @@ -124,7 +118,6 @@ class SQLCompiler(object): result.append('LIMIT %d' % val) result.append('OFFSET %d' % self.query.low_mark) - params.extend(self.query.extra_params) return ' '.join(result), tuple(params) def as_nested_sql(self): |