diff options
| author | Brian Rosner <brosner@gmail.com> | 2008-05-14 05:48:44 +0000 |
|---|---|---|
| committer | Brian Rosner <brosner@gmail.com> | 2008-05-14 05:48:44 +0000 |
| commit | 13ae9e484d6dbd1ab0affee07922a5337591fa5f (patch) | |
| tree | fa7bc9b9da0a487909762a421e603a601eb7f6d0 /django/db/models/sql | |
| parent | 4e5681caf38d984c31224ac73fe25ca7f89d8ac6 (diff) | |
newforms-admin: Merged from trunk up to [7526].
git-svn-id: http://code.djangoproject.com/svn/django/branches/newforms-admin@7533 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'django/db/models/sql')
| -rw-r--r-- | django/db/models/sql/query.py | 3 | ||||
| -rw-r--r-- | django/db/models/sql/where.py | 6 |
2 files changed, 5 insertions, 4 deletions
diff --git a/django/db/models/sql/query.py b/django/db/models/sql/query.py index 7e9fb00418..a6957bab7b 100644 --- a/django/db/models/sql/query.py +++ b/django/db/models/sql/query.py @@ -394,7 +394,8 @@ class Query(object): some cases to avoid ambiguitity with nested queries. """ qn = self.quote_name_unless_alias - result = ['(%s) AS %s' % (col, alias) for alias, col in self.extra_select.iteritems()] + qn2 = self.connection.ops.quote_name + result = ['(%s) AS %s' % (col, qn2(alias)) for alias, col in self.extra_select.iteritems()] aliases = set(self.extra_select.keys()) if with_aliases: col_aliases = aliases.copy() diff --git a/django/db/models/sql/where.py b/django/db/models/sql/where.py index c8857a01fe..3e8bfed087 100644 --- a/django/db/models/sql/where.py +++ b/django/db/models/sql/where.py @@ -51,12 +51,12 @@ class WhereNode(tree.Node): format = '(%s)' elif isinstance(child, tree.Node): sql, params = self.as_sql(child, qn) - if len(child.children) == 1: + if child.negated: + format = 'NOT (%s)' + elif len(child.children) == 1: format = '%s' else: format = '(%s)' - if child.negated: - format = 'NOT %s' % format else: sql, params = self.make_atom(child, qn) format = '%s' |