Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Create SQL statements for QuerySets.
|
|
|
|
|
|
|
|
The code in here encapsulates all of the SQL construction so that QuerySets
|
|
|
|
themselves do not have to (and could be backed by things other than SQL
|
|
|
|
databases). The abstraction barrier only works one way: this module has to know
|
|
|
|
all about the internals of models in order to get the information it needs.
|
|
|
|
"""
|
|
|
|
|
2013-08-03 13:41:15 +08:00
|
|
|
from collections import OrderedDict
|
2011-03-28 10:11:19 +08:00
|
|
|
import copy
|
2011-09-10 03:22:28 +08:00
|
|
|
|
2012-07-21 16:00:10 +08:00
|
|
|
from django.utils.encoding import force_text
|
2011-09-10 03:22:28 +08:00
|
|
|
from django.utils.tree import Node
|
2012-07-21 03:14:27 +08:00
|
|
|
from django.utils import six
|
2009-12-22 23:18:51 +08:00
|
|
|
from django.db import connections, DEFAULT_DB_ALIAS
|
2012-09-09 07:51:36 +08:00
|
|
|
from django.db.models.constants import LOOKUP_SEP
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
from django.db.models.aggregates import refs_aggregate
|
2011-11-13 23:09:08 +08:00
|
|
|
from django.db.models.expressions import ExpressionNode
|
2008-06-29 17:40:17 +08:00
|
|
|
from django.db.models.fields import FieldDoesNotExist
|
2012-12-17 23:09:07 +08:00
|
|
|
from django.db.models.related import PathInfo
|
2009-01-15 19:06:34 +08:00
|
|
|
from django.db.models.sql import aggregates as base_aggregates_module
|
2012-09-09 07:51:36 +08:00
|
|
|
from django.db.models.sql.constants import (QUERY_TERMS, ORDER_DIR, SINGLE,
|
2012-12-17 23:09:07 +08:00
|
|
|
ORDER_PATTERN, JoinInfo, SelectInfo)
|
2009-12-22 23:18:51 +08:00
|
|
|
from django.db.models.sql.datastructures import EmptyResultSet, Empty, MultiJoin
|
2009-01-29 18:46:36 +08:00
|
|
|
from django.db.models.sql.expressions import SQLEvaluator
|
2010-02-23 12:39:39 +08:00
|
|
|
from django.db.models.sql.where import (WhereNode, Constraint, EverythingNode,
|
2012-10-24 05:04:37 +08:00
|
|
|
ExtraWhere, AND, OR, EmptyWhere)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
from django.core.exceptions import FieldError
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
__all__ = ['Query', 'RawQuery']
|
2009-12-20 10:46:58 +08:00
|
|
|
|
2012-09-07 22:58:17 +08:00
|
|
|
|
2009-12-20 10:46:58 +08:00
|
|
|
class RawQuery(object):
|
|
|
|
"""
|
|
|
|
A single raw SQL query
|
|
|
|
"""
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def __init__(self, sql, using, params=None):
|
2009-12-20 10:46:58 +08:00
|
|
|
self.params = params or ()
|
|
|
|
self.sql = sql
|
2009-12-22 23:18:51 +08:00
|
|
|
self.using = using
|
2009-12-20 10:46:58 +08:00
|
|
|
self.cursor = None
|
|
|
|
|
2010-04-02 22:44:16 +08:00
|
|
|
# Mirror some properties of a normal query so that
|
|
|
|
# the compiler can be used to process results.
|
|
|
|
self.low_mark, self.high_mark = 0, None # Used for offset/limit
|
|
|
|
self.extra_select = {}
|
|
|
|
self.aggregate_select = {}
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def clone(self, using):
|
|
|
|
return RawQuery(self.sql, using, params=self.params)
|
|
|
|
|
2010-04-02 22:44:16 +08:00
|
|
|
def convert_values(self, value, field, connection):
|
|
|
|
"""Convert the database-returned value into a type that is consistent
|
|
|
|
across database backends.
|
|
|
|
|
|
|
|
By default, this defers to the underlying backend operations, but
|
|
|
|
it can be overridden by Query classes for specific backends.
|
|
|
|
"""
|
|
|
|
return connection.ops.convert_values(value, field)
|
|
|
|
|
2009-12-20 10:46:58 +08:00
|
|
|
def get_columns(self):
|
|
|
|
if self.cursor is None:
|
|
|
|
self._execute_query()
|
2009-12-23 05:05:15 +08:00
|
|
|
converter = connections[self.using].introspection.table_name_converter
|
|
|
|
return [converter(column_meta[0])
|
|
|
|
for column_meta in self.cursor.description]
|
2009-12-20 10:46:58 +08:00
|
|
|
|
|
|
|
def __iter__(self):
|
|
|
|
# Always execute a new query for a new iterator.
|
2010-02-23 13:22:12 +08:00
|
|
|
# This could be optimized with a cache at the expense of RAM.
|
2009-12-20 10:46:58 +08:00
|
|
|
self._execute_query()
|
2010-04-15 21:01:51 +08:00
|
|
|
if not connections[self.using].features.can_use_chunked_reads:
|
|
|
|
# If the database can't use chunked reads we need to make sure we
|
|
|
|
# evaluate the entire query up front.
|
|
|
|
result = list(self.cursor)
|
|
|
|
else:
|
|
|
|
result = self.cursor
|
|
|
|
return iter(result)
|
2009-12-20 10:46:58 +08:00
|
|
|
|
|
|
|
def __repr__(self):
|
2011-04-23 02:17:26 +08:00
|
|
|
return "<RawQuery: %r>" % (self.sql % tuple(self.params))
|
2009-12-20 10:46:58 +08:00
|
|
|
|
|
|
|
def _execute_query(self):
|
2009-12-22 23:18:51 +08:00
|
|
|
self.cursor = connections[self.using].cursor()
|
2009-12-20 10:46:58 +08:00
|
|
|
self.cursor.execute(self.sql, self.params)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
|
|
|
|
class Query(object):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
A single SQL query.
|
|
|
|
"""
|
|
|
|
# SQL join types. These are part of the class because their string forms
|
|
|
|
# vary from database to database and can be customised by a subclass.
|
|
|
|
INNER = 'INNER JOIN'
|
|
|
|
LOUTER = 'LEFT OUTER JOIN'
|
|
|
|
|
|
|
|
alias_prefix = 'T'
|
2013-08-13 19:11:52 +08:00
|
|
|
subq_aliases = frozenset([alias_prefix])
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
query_terms = QUERY_TERMS
|
2009-01-15 19:06:34 +08:00
|
|
|
aggregates_module = base_aggregates_module
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
compiler = 'SQLCompiler'
|
|
|
|
|
|
|
|
def __init__(self, model, where=WhereNode):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.model = model
|
2012-11-11 07:59:24 +08:00
|
|
|
self.alias_refcount = {}
|
2012-04-30 06:50:48 +08:00
|
|
|
# alias_map is the most important data structure regarding joins.
|
|
|
|
# It's used for recording which joins exist in the query and what
|
|
|
|
# type they are. The key is the alias of the joined table (possibly
|
|
|
|
# the table name) and the value is JoinInfo from constants.py.
|
|
|
|
self.alias_map = {}
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.table_map = {} # Maps table names to list of aliases.
|
|
|
|
self.join_map = {}
|
|
|
|
self.default_cols = True
|
|
|
|
self.default_ordering = True
|
|
|
|
self.standard_ordering = True
|
2008-08-23 06:00:28 +08:00
|
|
|
self.used_aliases = set()
|
|
|
|
self.filter_is_sticky = False
|
2009-03-04 13:34:01 +08:00
|
|
|
self.included_inherited_models = {}
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-08-25 21:33:07 +08:00
|
|
|
# SQL-related attributes
|
2012-10-26 01:57:32 +08:00
|
|
|
# Select and related select clauses as SelectInfo instances.
|
|
|
|
# The select is used for cases where we want to set up the select
|
|
|
|
# clause to contain other than default fields (values(), annotate(),
|
|
|
|
# subqueries...)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.select = []
|
2012-10-26 01:57:32 +08:00
|
|
|
# The related_select_cols is used for columns needed for
|
|
|
|
# select_related - this is populated in compile stage.
|
|
|
|
self.related_select_cols = []
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.tables = [] # Aliases in the order they are created.
|
|
|
|
self.where = where()
|
|
|
|
self.where_class = where
|
2009-02-16 20:29:31 +08:00
|
|
|
self.group_by = None
|
2009-01-05 19:47:14 +08:00
|
|
|
self.having = where()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.order_by = []
|
|
|
|
self.low_mark, self.high_mark = 0, None # Used for offset/limit
|
|
|
|
self.distinct = False
|
2011-12-23 04:42:40 +08:00
|
|
|
self.distinct_fields = []
|
2011-04-21 04:42:07 +08:00
|
|
|
self.select_for_update = False
|
|
|
|
self.select_for_update_nowait = False
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.select_related = False
|
|
|
|
|
2009-01-15 19:06:34 +08:00
|
|
|
# SQL aggregate-related attributes
|
2013-08-21 19:25:19 +08:00
|
|
|
# The _aggregates will be an OrderedDict when used. Due to the cost
|
|
|
|
# of creating OrderedDict this attribute is created lazily (in
|
|
|
|
# self.aggregates property).
|
|
|
|
self._aggregates = None # Maps alias -> SQL aggregate function
|
2009-02-23 22:47:59 +08:00
|
|
|
self.aggregate_select_mask = None
|
|
|
|
self._aggregate_select_cache = None
|
2009-01-15 19:06:34 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
# Arbitrary maximum limit for select_related. Prevents infinite
|
|
|
|
# recursion. Can be changed by the depth parameter to select_related().
|
|
|
|
self.max_depth = 5
|
|
|
|
|
|
|
|
# These are for extensions. The contents are more or less appended
|
|
|
|
# verbatim to the appropriate clause.
|
2013-08-21 19:25:19 +08:00
|
|
|
# The _extra attribute is an OrderedDict, lazily created similarly to
|
|
|
|
# .aggregates
|
|
|
|
self._extra = None # Maps col_alias -> (col_sql, params).
|
2009-04-30 23:40:09 +08:00
|
|
|
self.extra_select_mask = None
|
|
|
|
self._extra_select_cache = None
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.extra_tables = ()
|
|
|
|
self.extra_order_by = ()
|
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
# A tuple that is a set of model field names and either True, if these
|
|
|
|
# are the fields to defer, or False if these are the only fields to
|
|
|
|
# load.
|
|
|
|
self.deferred_loading = (set(), True)
|
|
|
|
|
2013-08-21 19:25:19 +08:00
|
|
|
@property
|
|
|
|
def extra(self):
|
|
|
|
if self._extra is None:
|
|
|
|
self._extra = OrderedDict()
|
|
|
|
return self._extra
|
|
|
|
|
|
|
|
@property
|
|
|
|
def aggregates(self):
|
|
|
|
if self._aggregates is None:
|
|
|
|
self._aggregates = OrderedDict()
|
|
|
|
return self._aggregates
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def __str__(self):
|
|
|
|
"""
|
|
|
|
Returns the query as a string of SQL with the parameter values
|
2011-08-23 11:38:28 +08:00
|
|
|
substituted in (use sql_with_params() to see the unsubstituted string).
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
Parameter values won't necessarily be quoted correctly, since that is
|
|
|
|
done by the database interface at execution time.
|
|
|
|
"""
|
2011-08-23 11:38:28 +08:00
|
|
|
sql, params = self.sql_with_params()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return sql % params
|
|
|
|
|
2011-08-23 11:38:28 +08:00
|
|
|
def sql_with_params(self):
|
|
|
|
"""
|
|
|
|
Returns the query as an SQL string and the parameters that will be
|
|
|
|
subsituted into the query.
|
|
|
|
"""
|
|
|
|
return self.get_compiler(DEFAULT_DB_ALIAS).as_sql()
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def __deepcopy__(self, memo):
|
2010-03-07 15:11:22 +08:00
|
|
|
result = self.clone(memo=memo)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
memo[id(self)] = result
|
|
|
|
return result
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def prepare(self):
|
|
|
|
return self
|
|
|
|
|
|
|
|
def get_compiler(self, using=None, connection=None):
|
|
|
|
if using is None and connection is None:
|
|
|
|
raise ValueError("Need either using or connection")
|
|
|
|
if using:
|
|
|
|
connection = connections[using]
|
2010-04-02 00:48:16 +08:00
|
|
|
|
|
|
|
# Check that the compiler will be able to execute the query
|
|
|
|
for alias, aggregate in self.aggregate_select.items():
|
|
|
|
connection.ops.check_aggregate_support(aggregate)
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
return connection.ops.compiler(self.compiler)(self, connection, using)
|
2008-04-28 22:14:41 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def get_meta(self):
|
|
|
|
"""
|
|
|
|
Returns the Options instance (the model._meta) from which to start
|
2008-12-08 10:39:51 +08:00
|
|
|
processing. Normally, this is self.model._meta, but it can be changed
|
|
|
|
by subclasses.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
return self.model._meta
|
|
|
|
|
2010-03-07 15:11:22 +08:00
|
|
|
def clone(self, klass=None, memo=None, **kwargs):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Creates a copy of the current instance. The 'kwargs' parameter can be
|
|
|
|
used by clients to update attributes after copying has taken place.
|
|
|
|
"""
|
|
|
|
obj = Empty()
|
|
|
|
obj.__class__ = klass or self.__class__
|
|
|
|
obj.model = self.model
|
|
|
|
obj.alias_refcount = self.alias_refcount.copy()
|
|
|
|
obj.alias_map = self.alias_map.copy()
|
|
|
|
obj.table_map = self.table_map.copy()
|
|
|
|
obj.join_map = self.join_map.copy()
|
|
|
|
obj.default_cols = self.default_cols
|
|
|
|
obj.default_ordering = self.default_ordering
|
|
|
|
obj.standard_ordering = self.standard_ordering
|
2009-03-04 13:34:01 +08:00
|
|
|
obj.included_inherited_models = self.included_inherited_models.copy()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.select = self.select[:]
|
2012-10-26 01:57:32 +08:00
|
|
|
obj.related_select_cols = []
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.tables = self.tables[:]
|
2012-06-02 09:13:36 +08:00
|
|
|
obj.where = self.where.clone()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.where_class = self.where_class
|
2009-02-16 20:29:31 +08:00
|
|
|
if self.group_by is None:
|
|
|
|
obj.group_by = None
|
|
|
|
else:
|
|
|
|
obj.group_by = self.group_by[:]
|
2012-06-02 09:13:36 +08:00
|
|
|
obj.having = self.having.clone()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.order_by = self.order_by[:]
|
|
|
|
obj.low_mark, obj.high_mark = self.low_mark, self.high_mark
|
|
|
|
obj.distinct = self.distinct
|
2011-12-23 04:42:40 +08:00
|
|
|
obj.distinct_fields = self.distinct_fields[:]
|
2011-04-21 04:42:07 +08:00
|
|
|
obj.select_for_update = self.select_for_update
|
|
|
|
obj.select_for_update_nowait = self.select_for_update_nowait
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.select_related = self.select_related
|
2012-06-02 09:13:36 +08:00
|
|
|
obj.related_select_cols = []
|
2013-08-21 19:25:19 +08:00
|
|
|
obj._aggregates = self._aggregates.copy() if self._aggregates is not None else None
|
2009-02-23 22:47:59 +08:00
|
|
|
if self.aggregate_select_mask is None:
|
|
|
|
obj.aggregate_select_mask = None
|
|
|
|
else:
|
2009-04-30 23:40:09 +08:00
|
|
|
obj.aggregate_select_mask = self.aggregate_select_mask.copy()
|
2010-03-22 04:47:52 +08:00
|
|
|
# _aggregate_select_cache cannot be copied, as doing so breaks the
|
|
|
|
# (necessary) state in which both aggregates and
|
|
|
|
# _aggregate_select_cache point to the same underlying objects.
|
|
|
|
# It will get re-populated in the cloned queryset the next time it's
|
|
|
|
# used.
|
|
|
|
obj._aggregate_select_cache = None
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.max_depth = self.max_depth
|
2013-08-21 19:25:19 +08:00
|
|
|
obj._extra = self._extra.copy() if self._extra is not None else None
|
2009-04-30 23:40:09 +08:00
|
|
|
if self.extra_select_mask is None:
|
|
|
|
obj.extra_select_mask = None
|
|
|
|
else:
|
|
|
|
obj.extra_select_mask = self.extra_select_mask.copy()
|
|
|
|
if self._extra_select_cache is None:
|
|
|
|
obj._extra_select_cache = None
|
|
|
|
else:
|
|
|
|
obj._extra_select_cache = self._extra_select_cache.copy()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.extra_tables = self.extra_tables
|
|
|
|
obj.extra_order_by = self.extra_order_by
|
2012-06-02 09:13:36 +08:00
|
|
|
obj.deferred_loading = copy.copy(self.deferred_loading[0]), self.deferred_loading[1]
|
2008-08-23 06:00:28 +08:00
|
|
|
if self.filter_is_sticky and self.used_aliases:
|
|
|
|
obj.used_aliases = self.used_aliases.copy()
|
|
|
|
else:
|
|
|
|
obj.used_aliases = set()
|
|
|
|
obj.filter_is_sticky = False
|
2013-08-13 19:11:52 +08:00
|
|
|
if 'alias_prefix' in self.__dict__:
|
|
|
|
obj.alias_prefix = self.alias_prefix
|
|
|
|
if 'subq_aliases' in self.__dict__:
|
|
|
|
obj.subq_aliases = self.subq_aliases.copy()
|
2011-12-23 04:42:40 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.__dict__.update(kwargs)
|
|
|
|
if hasattr(obj, '_setup_query'):
|
|
|
|
obj._setup_query()
|
|
|
|
return obj
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def convert_values(self, value, field, connection):
|
2009-01-15 19:06:34 +08:00
|
|
|
"""Convert the database-returned value into a type that is consistent
|
|
|
|
across database backends.
|
|
|
|
|
|
|
|
By default, this defers to the underlying backend operations, but
|
|
|
|
it can be overridden by Query classes for specific backends.
|
|
|
|
"""
|
2009-12-22 23:18:51 +08:00
|
|
|
return connection.ops.convert_values(value, field)
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def resolve_aggregate(self, value, aggregate, connection):
|
2009-01-15 19:06:34 +08:00
|
|
|
"""Resolve the value of aggregates returned by the database to
|
|
|
|
consistent (and reasonable) types.
|
|
|
|
|
|
|
|
This is required because of the predisposition of certain backends
|
|
|
|
to return Decimal and long types when they are not needed.
|
|
|
|
"""
|
|
|
|
if value is None:
|
2009-01-23 19:03:48 +08:00
|
|
|
if aggregate.is_ordinal:
|
|
|
|
return 0
|
2009-01-15 19:06:34 +08:00
|
|
|
# Return None as-is
|
|
|
|
return value
|
|
|
|
elif aggregate.is_ordinal:
|
|
|
|
# Any ordinal aggregate (e.g., count) returns an int
|
|
|
|
return int(value)
|
|
|
|
elif aggregate.is_computed:
|
|
|
|
# Any computed aggregate (e.g., avg) returns a float
|
|
|
|
return float(value)
|
|
|
|
else:
|
|
|
|
# Return value depends on the type of the field being processed.
|
2009-12-22 23:18:51 +08:00
|
|
|
return self.convert_values(value, aggregate.field, connection)
|
|
|
|
|
2013-08-19 21:00:17 +08:00
|
|
|
def get_aggregation(self, using, force_subq=False):
|
2009-01-15 19:06:34 +08:00
|
|
|
"""
|
|
|
|
Returns the dictionary with the values of the existing aggregations.
|
|
|
|
"""
|
|
|
|
if not self.aggregate_select:
|
|
|
|
return {}
|
|
|
|
|
|
|
|
# If there is a group by clause, aggregating does not add useful
|
|
|
|
# information but retrieves only the first row. Aggregate
|
|
|
|
# over the subquery instead.
|
2013-08-19 21:00:17 +08:00
|
|
|
if self.group_by is not None or force_subq:
|
2013-02-20 05:58:09 +08:00
|
|
|
|
2010-11-17 10:57:14 +08:00
|
|
|
from django.db.models.sql.subqueries import AggregateQuery
|
2009-12-22 23:18:51 +08:00
|
|
|
query = AggregateQuery(self.model)
|
2009-01-15 19:06:34 +08:00
|
|
|
obj = self.clone()
|
2013-08-19 21:14:31 +08:00
|
|
|
if not force_subq:
|
|
|
|
# In forced subq case the ordering and limits will likely
|
|
|
|
# affect the results.
|
|
|
|
obj.clear_ordering(True)
|
|
|
|
obj.clear_limits()
|
|
|
|
obj.select_for_update = False
|
|
|
|
obj.select_related = False
|
|
|
|
obj.related_select_cols = []
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2013-08-19 21:14:31 +08:00
|
|
|
relabels = dict((t, 'subquery') for t in self.tables)
|
2009-01-15 19:06:34 +08:00
|
|
|
# Remove any aggregates marked for reduction from the subquery
|
|
|
|
# and move them to the outer AggregateQuery.
|
|
|
|
for alias, aggregate in self.aggregate_select.items():
|
|
|
|
if aggregate.is_summary:
|
2013-08-21 19:25:19 +08:00
|
|
|
query.aggregates[alias] = aggregate.relabeled_clone(relabels)
|
2009-01-15 19:06:34 +08:00
|
|
|
del obj.aggregate_select[alias]
|
|
|
|
|
2010-11-17 10:57:14 +08:00
|
|
|
try:
|
|
|
|
query.add_subquery(obj, using)
|
|
|
|
except EmptyResultSet:
|
|
|
|
return dict(
|
|
|
|
(alias, None)
|
|
|
|
for alias in query.aggregate_select
|
|
|
|
)
|
2009-01-15 19:06:34 +08:00
|
|
|
else:
|
|
|
|
query = self
|
|
|
|
self.select = []
|
|
|
|
self.default_cols = False
|
2013-08-21 19:25:19 +08:00
|
|
|
self._extra = {}
|
2009-03-04 13:34:01 +08:00
|
|
|
self.remove_inherited_models()
|
2009-01-15 19:06:34 +08:00
|
|
|
|
|
|
|
query.clear_ordering(True)
|
|
|
|
query.clear_limits()
|
2011-04-21 04:42:07 +08:00
|
|
|
query.select_for_update = False
|
2009-01-15 19:06:34 +08:00
|
|
|
query.select_related = False
|
|
|
|
query.related_select_cols = []
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
result = query.get_compiler(using).execute_sql(SINGLE)
|
2009-01-23 19:03:48 +08:00
|
|
|
if result is None:
|
|
|
|
result = [None for q in query.aggregate_select.items()]
|
|
|
|
|
2013-08-30 07:20:00 +08:00
|
|
|
return dict(
|
2009-12-22 23:18:51 +08:00
|
|
|
(alias, self.resolve_aggregate(val, aggregate, connection=connections[using]))
|
2009-01-15 19:06:34 +08:00
|
|
|
for (alias, aggregate), val
|
2009-01-23 19:03:48 +08:00
|
|
|
in zip(query.aggregate_select.items(), result)
|
2013-08-30 07:20:00 +08:00
|
|
|
)
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def get_count(self, using):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Performs a COUNT() query using the current filter constraints.
|
|
|
|
"""
|
|
|
|
obj = self.clone()
|
2011-12-23 04:42:40 +08:00
|
|
|
if len(self.select) > 1 or self.aggregate_select or (self.distinct and self.distinct_fields):
|
2009-01-15 19:06:34 +08:00
|
|
|
# If a select clause exists, then the query has already started to
|
|
|
|
# specify the columns that are to be returned.
|
|
|
|
# In this case, we need to use a subquery to evaluate the count.
|
2010-11-17 10:57:14 +08:00
|
|
|
from django.db.models.sql.subqueries import AggregateQuery
|
2009-01-15 19:06:34 +08:00
|
|
|
subquery = obj
|
|
|
|
subquery.clear_ordering(True)
|
|
|
|
subquery.clear_limits()
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
obj = AggregateQuery(obj.model)
|
2010-11-17 10:57:14 +08:00
|
|
|
try:
|
|
|
|
obj.add_subquery(subquery, using=using)
|
|
|
|
except EmptyResultSet:
|
|
|
|
# add_subquery evaluates the query, if it's an EmptyResultSet
|
|
|
|
# then there are can be no results, and therefore there the
|
|
|
|
# count is obviously 0
|
|
|
|
return 0
|
2009-01-15 19:06:34 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
obj.add_count_column()
|
2009-12-22 23:18:51 +08:00
|
|
|
number = obj.get_aggregation(using=using)[None]
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# Apply offset and limit constraints manually, since using LIMIT/OFFSET
|
|
|
|
# in SQL (in variants that provide them) doesn't change the COUNT
|
|
|
|
# output.
|
|
|
|
number = max(0, number - self.low_mark)
|
2009-03-01 09:24:03 +08:00
|
|
|
if self.high_mark is not None:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
number = min(number, self.high_mark - self.low_mark)
|
|
|
|
|
|
|
|
return number
|
|
|
|
|
2009-12-22 23:18:51 +08:00
|
|
|
def has_results(self, using):
|
2009-10-24 08:28:39 +08:00
|
|
|
q = self.clone()
|
2013-10-06 02:40:36 +08:00
|
|
|
if not q.distinct:
|
|
|
|
q.clear_select_clause()
|
2010-03-20 18:37:57 +08:00
|
|
|
q.clear_ordering(True)
|
2009-10-26 00:32:07 +08:00
|
|
|
q.set_limits(high=1)
|
2009-12-22 23:18:51 +08:00
|
|
|
compiler = q.get_compiler(using=using)
|
2013-07-08 23:05:08 +08:00
|
|
|
return compiler.has_results()
|
2009-01-05 19:47:48 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def combine(self, rhs, connector):
|
|
|
|
"""
|
|
|
|
Merge the 'rhs' query into the current one (with any 'rhs' effects
|
|
|
|
being applied *after* (that is, "to the right of") anything in the
|
|
|
|
current query. 'rhs' is not modified during a call to this function.
|
|
|
|
|
|
|
|
The 'connector' parameter describes how to connect filters from the
|
|
|
|
'rhs' query.
|
|
|
|
"""
|
|
|
|
assert self.model == rhs.model, \
|
|
|
|
"Cannot combine queries on two different base models."
|
|
|
|
assert self.can_filter(), \
|
|
|
|
"Cannot combine queries once a slice has been taken."
|
|
|
|
assert self.distinct == rhs.distinct, \
|
|
|
|
"Cannot combine a unique query with a non-unique query."
|
2011-12-23 04:42:40 +08:00
|
|
|
assert self.distinct_fields == rhs.distinct_fields, \
|
|
|
|
"Cannot combine queries with different distinct fields."
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2009-03-04 13:34:01 +08:00
|
|
|
self.remove_inherited_models()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
# Work out how to relabel the rhs aliases, if necessary.
|
|
|
|
change_map = {}
|
|
|
|
conjunction = (connector == AND)
|
2012-08-11 03:00:21 +08:00
|
|
|
|
|
|
|
# Determine which existing joins can be reused. When combining the
|
|
|
|
# query with AND we must recreate all joins for m2m filters. When
|
|
|
|
# combining with OR we can reuse joins. The reason is that in AND
|
|
|
|
# case a single row can't fulfill a condition like:
|
|
|
|
# revrel__col=1 & revrel__col=2
|
|
|
|
# But, there might be two different related rows matching this
|
|
|
|
# condition. In OR case a single True is enough, so single row is
|
|
|
|
# enough, too.
|
|
|
|
#
|
|
|
|
# Note that we will be creating duplicate joins for non-m2m joins in
|
|
|
|
# the AND case. The results will be correct but this creates too many
|
|
|
|
# joins. This is something that could be fixed later on.
|
|
|
|
reuse = set() if conjunction else set(self.tables)
|
|
|
|
# Base table must be present in the query - this is the same
|
|
|
|
# table on both sides.
|
|
|
|
self.get_initial_alias()
|
|
|
|
# Now, add the joins from rhs query into the new query (skipping base
|
|
|
|
# table).
|
|
|
|
for alias in rhs.tables[1:]:
|
2013-03-25 00:40:40 +08:00
|
|
|
table, _, join_type, lhs, join_cols, nullable, join_field = rhs.alias_map[alias]
|
2012-08-11 03:00:21 +08:00
|
|
|
promote = (join_type == self.LOUTER)
|
2011-05-06 04:26:26 +08:00
|
|
|
# If the left side of the join was already relabeled, use the
|
|
|
|
# updated alias.
|
|
|
|
lhs = change_map.get(lhs, lhs)
|
2012-08-11 03:00:21 +08:00
|
|
|
new_alias = self.join(
|
2013-03-25 00:40:40 +08:00
|
|
|
(lhs, table, join_cols), reuse=reuse,
|
2012-08-25 21:33:07 +08:00
|
|
|
outer_if_first=not conjunction, nullable=nullable,
|
|
|
|
join_field=join_field)
|
2013-02-19 10:47:47 +08:00
|
|
|
if promote:
|
|
|
|
self.promote_joins([new_alias])
|
2012-08-11 03:00:21 +08:00
|
|
|
# We can't reuse the same join again in the query. If we have two
|
|
|
|
# distinct joins for the same connection in rhs query, then the
|
|
|
|
# combined query must have two joins, too.
|
|
|
|
reuse.discard(new_alias)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
change_map[alias] = new_alias
|
2012-08-25 21:33:07 +08:00
|
|
|
if not rhs.alias_refcount[alias]:
|
|
|
|
# The alias was unused in the rhs query. Unref it so that it
|
|
|
|
# will be unused in the new query, too. We have to add and
|
|
|
|
# unref the alias so that join promotion has information of
|
|
|
|
# the join type for the unused alias.
|
|
|
|
self.unref_alias(new_alias)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-02-19 18:46:11 +08:00
|
|
|
# So that we don't exclude valid results in an OR query combination,
|
2011-03-03 21:51:54 +08:00
|
|
|
# all joins exclusive to either the lhs or the rhs must be converted
|
2013-02-19 18:46:11 +08:00
|
|
|
# to an outer join. RHS joins were already set to outer joins above,
|
|
|
|
# so check which joins were used only in the lhs query.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not conjunction:
|
2013-02-19 18:46:11 +08:00
|
|
|
rhs_used_joins = set(change_map.values())
|
|
|
|
to_promote = [alias for alias in self.tables
|
|
|
|
if alias not in rhs_used_joins]
|
2013-08-07 17:38:30 +08:00
|
|
|
self.promote_joins(to_promote)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# Now relabel a copy of the rhs where-clause and add it to the current
|
|
|
|
# one.
|
|
|
|
if rhs.where:
|
2012-06-02 09:13:36 +08:00
|
|
|
w = rhs.where.clone()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
w.relabel_aliases(change_map)
|
|
|
|
if not self.where:
|
|
|
|
# Since 'self' matches everything, add an explicit "include
|
|
|
|
# everything" where-constraint so that connections between the
|
|
|
|
# where clauses won't exclude valid results.
|
|
|
|
self.where.add(EverythingNode(), AND)
|
|
|
|
elif self.where:
|
|
|
|
# rhs has an empty where clause.
|
|
|
|
w = self.where_class()
|
|
|
|
w.add(EverythingNode(), AND)
|
|
|
|
else:
|
|
|
|
w = self.where_class()
|
|
|
|
self.where.add(w, connector)
|
|
|
|
|
|
|
|
# Selection columns and extra extensions are those provided by 'rhs'.
|
|
|
|
self.select = []
|
2012-10-26 01:57:32 +08:00
|
|
|
for col, field in rhs.select:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if isinstance(col, (list, tuple)):
|
2012-10-26 01:57:32 +08:00
|
|
|
new_col = change_map.get(col[0], col[0]), col[1]
|
|
|
|
self.select.append(SelectInfo(new_col, field))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
2013-03-02 07:06:56 +08:00
|
|
|
new_col = col.relabeled_clone(change_map)
|
|
|
|
self.select.append(SelectInfo(new_col, field))
|
2008-06-30 14:24:21 +08:00
|
|
|
|
|
|
|
if connector == OR:
|
|
|
|
# It would be nice to be able to handle this, but the queries don't
|
|
|
|
# really make sense (or return consistent value sets). Not worth
|
|
|
|
# the extra complexity when you can write a real query instead.
|
2013-08-21 19:25:19 +08:00
|
|
|
if self._extra and rhs._extra:
|
2008-06-30 14:24:21 +08:00
|
|
|
raise ValueError("When merging querysets using 'or', you "
|
|
|
|
"cannot have extra(select=...) on both sides.")
|
2009-04-30 23:40:09 +08:00
|
|
|
self.extra.update(rhs.extra)
|
|
|
|
extra_select_mask = set()
|
|
|
|
if self.extra_select_mask is not None:
|
|
|
|
extra_select_mask.update(self.extra_select_mask)
|
|
|
|
if rhs.extra_select_mask is not None:
|
|
|
|
extra_select_mask.update(rhs.extra_select_mask)
|
|
|
|
if extra_select_mask:
|
|
|
|
self.set_extra_mask(extra_select_mask)
|
2008-06-30 14:24:21 +08:00
|
|
|
self.extra_tables += rhs.extra_tables
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# Ordering uses the 'rhs' ordering, unless it has none, in which case
|
|
|
|
# the current ordering is used.
|
2013-05-17 22:33:36 +08:00
|
|
|
self.order_by = rhs.order_by[:] if rhs.order_by else self.order_by
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.extra_order_by = rhs.extra_order_by or self.extra_order_by
|
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
def deferred_to_data(self, target, callback):
|
|
|
|
"""
|
|
|
|
Converts the self.deferred_loading data structure to an alternate data
|
|
|
|
structure, describing the field that *will* be loaded. This is used to
|
|
|
|
compute the columns to select from the database and also by the
|
|
|
|
QuerySet class to work out which fields are being initialised on each
|
|
|
|
model. Models that have all their fields included aren't mentioned in
|
|
|
|
the result, only those that have field restrictions in place.
|
|
|
|
|
|
|
|
The "target" parameter is the instance that is populated (in place).
|
|
|
|
The "callback" is a function that is called whenever a (model, field)
|
|
|
|
pair need to be added to "target". It accepts three parameters:
|
|
|
|
"target", and the model and list of fields being added for that model.
|
|
|
|
"""
|
|
|
|
field_names, defer = self.deferred_loading
|
|
|
|
if not field_names:
|
|
|
|
return
|
2013-05-14 03:40:39 +08:00
|
|
|
orig_opts = self.get_meta()
|
2009-03-19 17:06:04 +08:00
|
|
|
seen = {}
|
2012-02-22 13:26:50 +08:00
|
|
|
must_include = {orig_opts.concrete_model: set([orig_opts.pk])}
|
2009-03-19 17:06:04 +08:00
|
|
|
for field_name in field_names:
|
|
|
|
parts = field_name.split(LOOKUP_SEP)
|
2009-04-04 13:35:01 +08:00
|
|
|
cur_model = self.model
|
|
|
|
opts = orig_opts
|
2009-03-19 17:06:04 +08:00
|
|
|
for name in parts[:-1]:
|
|
|
|
old_model = cur_model
|
|
|
|
source = opts.get_field_by_name(name)[0]
|
2012-11-29 00:16:00 +08:00
|
|
|
if is_reverse_o2o(source):
|
|
|
|
cur_model = source.model
|
|
|
|
else:
|
|
|
|
cur_model = source.rel.to
|
2009-03-19 17:06:04 +08:00
|
|
|
opts = cur_model._meta
|
|
|
|
# Even if we're "just passing through" this model, we must add
|
|
|
|
# both the current model's pk and the related reference field
|
2012-11-29 00:16:00 +08:00
|
|
|
# (if it's not a reverse relation) to the things we select.
|
|
|
|
if not is_reverse_o2o(source):
|
|
|
|
must_include[old_model].add(source)
|
2009-03-19 17:06:04 +08:00
|
|
|
add_to_dict(must_include, cur_model, opts.pk)
|
|
|
|
field, model, _, _ = opts.get_field_by_name(parts[-1])
|
|
|
|
if model is None:
|
|
|
|
model = cur_model
|
2012-11-29 00:16:00 +08:00
|
|
|
if not is_reverse_o2o(field):
|
|
|
|
add_to_dict(seen, model, field)
|
2009-03-19 17:06:04 +08:00
|
|
|
|
|
|
|
if defer:
|
|
|
|
# We need to load all fields for each model, except those that
|
|
|
|
# appear in "seen" (for all models that appear in "seen"). The only
|
|
|
|
# slight complexity here is handling fields that exist on parent
|
|
|
|
# models.
|
|
|
|
workset = {}
|
2012-07-21 03:14:27 +08:00
|
|
|
for model, values in six.iteritems(seen):
|
2010-05-01 00:32:48 +08:00
|
|
|
for field, m in model._meta.get_fields_with_model():
|
2009-03-19 17:06:04 +08:00
|
|
|
if field in values:
|
|
|
|
continue
|
2010-05-01 00:32:48 +08:00
|
|
|
add_to_dict(workset, m or model, field)
|
2012-07-21 03:14:27 +08:00
|
|
|
for model, values in six.iteritems(must_include):
|
2009-03-19 17:06:04 +08:00
|
|
|
# If we haven't included a model in workset, we don't add the
|
|
|
|
# corresponding must_include fields for that model, since an
|
|
|
|
# empty set means "include all fields". That's why there's no
|
|
|
|
# "else" branch here.
|
|
|
|
if model in workset:
|
|
|
|
workset[model].update(values)
|
2012-07-21 03:14:27 +08:00
|
|
|
for model, values in six.iteritems(workset):
|
2009-03-19 17:06:04 +08:00
|
|
|
callback(target, model, values)
|
|
|
|
else:
|
2012-07-21 03:14:27 +08:00
|
|
|
for model, values in six.iteritems(must_include):
|
2009-03-19 17:06:04 +08:00
|
|
|
if model in seen:
|
|
|
|
seen[model].update(values)
|
|
|
|
else:
|
|
|
|
# As we've passed through this model, but not explicitly
|
|
|
|
# included any fields, we have to make sure it's mentioned
|
|
|
|
# so that only the "must include" fields are pulled in.
|
|
|
|
seen[model] = values
|
2009-06-06 14:14:05 +08:00
|
|
|
# Now ensure that every model in the inheritance chain is mentioned
|
|
|
|
# in the parent list. Again, it must be mentioned to ensure that
|
|
|
|
# only "must include" fields are pulled in.
|
|
|
|
for model in orig_opts.get_parent_list():
|
|
|
|
if model not in seen:
|
|
|
|
seen[model] = set()
|
2012-07-21 03:14:27 +08:00
|
|
|
for model, values in six.iteritems(seen):
|
2009-03-19 17:06:04 +08:00
|
|
|
callback(target, model, values)
|
|
|
|
|
|
|
|
def deferred_to_columns_cb(self, target, model, fields):
|
|
|
|
"""
|
|
|
|
Callback used by deferred_to_columns(). The "target" parameter should
|
|
|
|
be a set instance.
|
|
|
|
"""
|
|
|
|
table = model._meta.db_table
|
|
|
|
if table not in target:
|
|
|
|
target[table] = set()
|
|
|
|
for field in fields:
|
|
|
|
target[table].add(field.column)
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def table_alias(self, table_name, create=False):
|
|
|
|
"""
|
|
|
|
Returns a table alias for the given table_name and whether this is a
|
|
|
|
new alias or not.
|
|
|
|
|
|
|
|
If 'create' is true, a new alias is always created. Otherwise, the
|
|
|
|
most recently created alias for the table (if one exists) is reused.
|
|
|
|
"""
|
|
|
|
current = self.table_map.get(table_name)
|
|
|
|
if not create and current:
|
|
|
|
alias = current[0]
|
|
|
|
self.alias_refcount[alias] += 1
|
|
|
|
return alias, False
|
|
|
|
|
|
|
|
# Create a new alias for this table.
|
|
|
|
if current:
|
|
|
|
alias = '%s%d' % (self.alias_prefix, len(self.alias_map) + 1)
|
|
|
|
current.append(alias)
|
|
|
|
else:
|
|
|
|
# The first occurence of a table uses the table name directly.
|
|
|
|
alias = table_name
|
|
|
|
self.table_map[alias] = [alias]
|
|
|
|
self.alias_refcount[alias] = 1
|
|
|
|
self.tables.append(alias)
|
|
|
|
return alias, True
|
|
|
|
|
|
|
|
def ref_alias(self, alias):
|
|
|
|
""" Increases the reference count for this alias. """
|
|
|
|
self.alias_refcount[alias] += 1
|
|
|
|
|
2011-12-23 04:42:40 +08:00
|
|
|
def unref_alias(self, alias, amount=1):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
""" Decreases the reference count for this alias. """
|
2011-12-23 04:42:40 +08:00
|
|
|
self.alias_refcount[alias] -= amount
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-08-07 17:38:30 +08:00
|
|
|
def promote_joins(self, aliases):
|
2012-08-22 02:54:14 +08:00
|
|
|
"""
|
|
|
|
Promotes recursively the join type of given aliases and its children to
|
|
|
|
an outer join. If 'unconditional' is False, the join is only promoted if
|
|
|
|
it is nullable or the parent join is an outer join.
|
|
|
|
|
|
|
|
Note about join promotion: When promoting any alias, we make sure all
|
|
|
|
joins which start from that alias are promoted, too. When adding a join
|
|
|
|
in join(), we make sure any join added to already existing LOUTER join
|
|
|
|
is generated as LOUTER. This ensures we don't ever have broken join
|
|
|
|
chains which contain first a LOUTER join, then an INNER JOIN, that is
|
|
|
|
this kind of join should never be generated: a LOUTER b INNER c. The
|
|
|
|
reason for avoiding this type of join chain is that the INNER after
|
|
|
|
the LOUTER will effectively remove any effect the LOUTER had.
|
|
|
|
"""
|
|
|
|
aliases = list(aliases)
|
|
|
|
while aliases:
|
|
|
|
alias = aliases.pop(0)
|
2013-03-25 00:40:40 +08:00
|
|
|
if self.alias_map[alias].join_cols[0][1] is None:
|
2012-10-08 23:36:51 +08:00
|
|
|
# This is the base table (first FROM entry) - this table
|
|
|
|
# isn't really joined at all in the query, so we should not
|
|
|
|
# alter its join type.
|
|
|
|
continue
|
2013-08-07 17:38:30 +08:00
|
|
|
# Only the first alias (skipped above) should have None join_type
|
|
|
|
assert self.alias_map[alias].join_type is not None
|
2012-08-22 02:54:14 +08:00
|
|
|
parent_alias = self.alias_map[alias].lhs_alias
|
|
|
|
parent_louter = (parent_alias
|
|
|
|
and self.alias_map[parent_alias].join_type == self.LOUTER)
|
|
|
|
already_louter = self.alias_map[alias].join_type == self.LOUTER
|
2013-08-07 17:38:30 +08:00
|
|
|
if ((self.alias_map[alias].nullable or parent_louter) and
|
|
|
|
not already_louter):
|
2012-08-22 02:54:14 +08:00
|
|
|
data = self.alias_map[alias]._replace(join_type=self.LOUTER)
|
|
|
|
self.alias_map[alias] = data
|
|
|
|
# Join type of 'alias' changed, so re-examine all aliases that
|
|
|
|
# refer to this one.
|
|
|
|
aliases.extend(
|
|
|
|
join for join in self.alias_map.keys()
|
|
|
|
if (self.alias_map[join].lhs_alias == alias
|
|
|
|
and join not in aliases))
|
2008-09-02 21:52:07 +08:00
|
|
|
|
2011-12-23 04:42:40 +08:00
|
|
|
def reset_refcounts(self, to_counts):
|
|
|
|
"""
|
|
|
|
This method will reset reference counts for aliases so that they match
|
|
|
|
the value passed in :param to_counts:.
|
|
|
|
"""
|
|
|
|
for alias, cur_refcount in self.alias_refcount.copy().items():
|
|
|
|
unref_amount = cur_refcount - to_counts.get(alias, 0)
|
|
|
|
self.unref_alias(alias, unref_amount)
|
|
|
|
|
2012-08-25 19:13:37 +08:00
|
|
|
def promote_disjunction(self, aliases_before, alias_usage_counts,
|
|
|
|
num_childs):
|
2008-09-02 21:52:07 +08:00
|
|
|
"""
|
2012-08-25 19:13:37 +08:00
|
|
|
This method is to be used for promoting joins in ORed filters.
|
|
|
|
|
|
|
|
The principle for promotion is: any alias which is used (it is in
|
|
|
|
alias_usage_counts), is not used by every child of the ORed filter,
|
|
|
|
and isn't pre-existing needs to be promoted to LOUTER join.
|
2008-09-02 21:52:07 +08:00
|
|
|
"""
|
2012-08-25 19:13:37 +08:00
|
|
|
for alias, use_count in alias_usage_counts.items():
|
|
|
|
if use_count < num_childs and alias not in aliases_before:
|
2012-08-22 02:54:14 +08:00
|
|
|
self.promote_joins([alias])
|
2008-09-02 21:52:07 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def change_aliases(self, change_map):
|
|
|
|
"""
|
|
|
|
Changes the aliases in change_map (which maps old-alias -> new-alias),
|
|
|
|
relabelling any references to them in select columns and the where
|
|
|
|
clause.
|
|
|
|
"""
|
|
|
|
assert set(change_map.keys()).intersection(set(change_map.values())) == set()
|
|
|
|
|
2012-10-26 01:57:32 +08:00
|
|
|
def relabel_column(col):
|
|
|
|
if isinstance(col, (list, tuple)):
|
|
|
|
old_alias = col[0]
|
|
|
|
return (change_map.get(old_alias, old_alias), col[1])
|
|
|
|
else:
|
2013-03-02 07:06:56 +08:00
|
|
|
return col.relabeled_clone(change_map)
|
2009-02-23 22:47:59 +08:00
|
|
|
# 1. Update references in "select" (normal columns plus aliases),
|
|
|
|
# "group by", "where" and "having".
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.where.relabel_aliases(change_map)
|
2009-02-23 22:47:59 +08:00
|
|
|
self.having.relabel_aliases(change_map)
|
2012-10-26 01:57:32 +08:00
|
|
|
if self.group_by:
|
|
|
|
self.group_by = [relabel_column(col) for col in self.group_by]
|
|
|
|
self.select = [SelectInfo(relabel_column(s.col), s.field)
|
|
|
|
for s in self.select]
|
2013-08-21 19:25:19 +08:00
|
|
|
if self._aggregates:
|
|
|
|
self._aggregates = OrderedDict(
|
|
|
|
(key, relabel_column(col)) for key, col in self._aggregates.items())
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# 2. Rename the alias in the internal table/alias datastructures.
|
2012-08-11 03:00:21 +08:00
|
|
|
for ident, aliases in self.join_map.items():
|
|
|
|
del self.join_map[ident]
|
2013-08-30 00:09:35 +08:00
|
|
|
aliases = tuple(change_map.get(a, a) for a in aliases)
|
2012-08-11 03:00:21 +08:00
|
|
|
ident = (change_map.get(ident[0], ident[0]),) + ident[1:]
|
|
|
|
self.join_map[ident] = aliases
|
2012-07-21 03:14:27 +08:00
|
|
|
for old_alias, new_alias in six.iteritems(change_map):
|
2012-04-30 06:50:48 +08:00
|
|
|
alias_data = self.alias_map[old_alias]
|
|
|
|
alias_data = alias_data._replace(rhs_alias=new_alias)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.alias_refcount[new_alias] = self.alias_refcount[old_alias]
|
|
|
|
del self.alias_refcount[old_alias]
|
2012-04-30 06:50:48 +08:00
|
|
|
self.alias_map[new_alias] = alias_data
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
del self.alias_map[old_alias]
|
|
|
|
|
2012-04-30 06:50:48 +08:00
|
|
|
table_aliases = self.table_map[alias_data.table_name]
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for pos, alias in enumerate(table_aliases):
|
|
|
|
if alias == old_alias:
|
|
|
|
table_aliases[pos] = new_alias
|
|
|
|
break
|
|
|
|
for pos, alias in enumerate(self.tables):
|
|
|
|
if alias == old_alias:
|
|
|
|
self.tables[pos] = new_alias
|
|
|
|
break
|
2009-03-04 13:34:01 +08:00
|
|
|
for key, alias in self.included_inherited_models.items():
|
|
|
|
if alias in change_map:
|
|
|
|
self.included_inherited_models[key] = change_map[alias]
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# 3. Update any joins that refer to the old alias.
|
2012-07-21 03:14:27 +08:00
|
|
|
for alias, data in six.iteritems(self.alias_map):
|
2012-04-30 06:50:48 +08:00
|
|
|
lhs = data.lhs_alias
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if lhs in change_map:
|
2012-04-30 06:50:48 +08:00
|
|
|
data = data._replace(lhs_alias=change_map[lhs])
|
|
|
|
self.alias_map[alias] = data
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-08-13 19:11:52 +08:00
|
|
|
def bump_prefix(self, outer_query):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2013-08-13 19:11:52 +08:00
|
|
|
Changes the alias prefix to the next letter in the alphabet in a way
|
|
|
|
that the outer query's aliases and this query's aliases will not
|
|
|
|
conflict. Even tables that previously had no alias will get an alias
|
|
|
|
after this call.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2013-08-13 19:11:52 +08:00
|
|
|
self.alias_prefix = chr(ord(self.alias_prefix) + 1)
|
|
|
|
while self.alias_prefix in self.subq_aliases:
|
|
|
|
self.alias_prefix = chr(ord(self.alias_prefix) + 1)
|
|
|
|
assert self.alias_prefix < 'Z'
|
|
|
|
self.subq_aliases = self.subq_aliases.union([self.alias_prefix])
|
|
|
|
outer_query.subq_aliases = outer_query.subq_aliases.union(self.subq_aliases)
|
2013-08-03 13:41:15 +08:00
|
|
|
change_map = OrderedDict()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for pos, alias in enumerate(self.tables):
|
2013-08-13 19:11:52 +08:00
|
|
|
new_alias = '%s%d' % (self.alias_prefix, pos)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
change_map[alias] = new_alias
|
|
|
|
self.tables[pos] = new_alias
|
|
|
|
self.change_aliases(change_map)
|
|
|
|
|
|
|
|
def get_initial_alias(self):
|
|
|
|
"""
|
|
|
|
Returns the first alias for this query, after increasing its reference
|
|
|
|
count.
|
|
|
|
"""
|
|
|
|
if self.tables:
|
|
|
|
alias = self.tables[0]
|
|
|
|
self.ref_alias(alias)
|
|
|
|
else:
|
2013-05-14 03:40:39 +08:00
|
|
|
alias = self.join((None, self.get_meta().db_table, None))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return alias
|
|
|
|
|
|
|
|
def count_active_tables(self):
|
|
|
|
"""
|
|
|
|
Returns the number of tables in this query with a non-zero reference
|
2011-12-23 04:42:40 +08:00
|
|
|
count. Note that after execution, the reference counts are zeroed, so
|
|
|
|
tables added in compiler will not be seen by this method.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2012-11-11 07:59:24 +08:00
|
|
|
return len([1 for count in self.alias_refcount.values() if count])
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-02-19 10:47:47 +08:00
|
|
|
def join(self, connection, reuse=None, outer_if_first=False,
|
|
|
|
nullable=False, join_field=None):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Returns an alias for the join in 'connection', either reusing an
|
|
|
|
existing alias for that join or creating a new one. 'connection' is a
|
2013-03-25 00:40:40 +08:00
|
|
|
tuple (lhs, table, join_cols) where 'lhs' is either an existing
|
|
|
|
table alias or a table name. 'join_cols' is a tuple of tuples containing
|
|
|
|
columns to join on ((l_id1, r_id1), (l_id2, r_id2)). The join corresponds
|
|
|
|
to the SQL equivalent of::
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-03-25 00:40:40 +08:00
|
|
|
lhs.l_id1 = table.r_id1 AND lhs.l_id2 = table.r_id2
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-12-21 03:25:48 +08:00
|
|
|
The 'reuse' parameter can be either None which means all joins
|
|
|
|
(matching the connection) are reusable, or it can be a set containing
|
|
|
|
the aliases that can be reused.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
If 'outer_if_first' is True and a new join is created, it will have the
|
2013-02-19 10:47:47 +08:00
|
|
|
LOUTER join type.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-08-22 02:54:14 +08:00
|
|
|
A join is always created as LOUTER if the lhs alias is LOUTER to make
|
2012-08-11 03:00:21 +08:00
|
|
|
sure we do not generate chains like t1 LOUTER t2 INNER t3.
|
2012-08-22 02:54:14 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
If 'nullable' is True, the join can potentially involve NULL values and
|
|
|
|
is a candidate for promotion (to "left outer") when combining querysets.
|
2012-08-25 21:33:07 +08:00
|
|
|
|
|
|
|
The 'join_field' is the field we are joining along (if any).
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2013-03-25 00:40:40 +08:00
|
|
|
lhs, table, join_cols = connection
|
2012-12-17 06:43:33 +08:00
|
|
|
assert lhs is None or join_field is not None
|
2012-08-11 03:00:21 +08:00
|
|
|
existing = self.join_map.get(connection, ())
|
2012-12-21 03:25:48 +08:00
|
|
|
if reuse is None:
|
2012-08-11 03:00:21 +08:00
|
|
|
reuse = existing
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
2012-08-11 03:00:21 +08:00
|
|
|
reuse = [a for a in existing if a in reuse]
|
2012-08-25 21:33:07 +08:00
|
|
|
for alias in reuse:
|
|
|
|
if join_field and self.alias_map[alias].join_field != join_field:
|
|
|
|
# The join_map doesn't contain join_field (mainly because
|
|
|
|
# fields in Query structs are problematic in pickling), so
|
|
|
|
# check that the existing join is created using the same
|
|
|
|
# join_field used for the under work join.
|
|
|
|
continue
|
2012-08-11 03:00:21 +08:00
|
|
|
self.ref_alias(alias)
|
|
|
|
return alias
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
# No reuse is possible, so we need a new alias.
|
|
|
|
alias, _ = self.table_alias(table, True)
|
|
|
|
if not lhs:
|
|
|
|
# Not all tables need to be joined to anything. No join type
|
|
|
|
# means the later columns are ignored.
|
|
|
|
join_type = None
|
2013-09-25 00:37:55 +08:00
|
|
|
elif self.alias_map[lhs].join_type == self.LOUTER:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
join_type = self.LOUTER
|
|
|
|
else:
|
|
|
|
join_type = self.INNER
|
2013-03-25 00:40:40 +08:00
|
|
|
join = JoinInfo(table, alias, join_type, lhs, join_cols or ((None, None),), nullable,
|
2012-08-25 21:33:07 +08:00
|
|
|
join_field)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.alias_map[alias] = join
|
2013-09-25 00:37:55 +08:00
|
|
|
if outer_if_first:
|
|
|
|
self.promote_joins([alias])
|
2012-08-11 03:00:21 +08:00
|
|
|
if connection in self.join_map:
|
|
|
|
self.join_map[connection] += (alias,)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
2012-08-11 03:00:21 +08:00
|
|
|
self.join_map[connection] = (alias,)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
return alias
|
|
|
|
|
2009-03-04 13:34:01 +08:00
|
|
|
def setup_inherited_models(self):
|
|
|
|
"""
|
|
|
|
If the model that is the basis for this QuerySet inherits other models,
|
|
|
|
we need to ensure that those other models have their tables included in
|
|
|
|
the query.
|
|
|
|
|
|
|
|
We do this as a separate step so that subclasses know which
|
|
|
|
tables are going to be active in the query, without needing to compute
|
|
|
|
all the select columns (this method is called from pre_sql_setup(),
|
|
|
|
whereas column determination is a later part, and side-effect, of
|
|
|
|
as_sql()).
|
|
|
|
"""
|
2013-05-14 03:40:39 +08:00
|
|
|
opts = self.get_meta()
|
2009-03-04 13:34:01 +08:00
|
|
|
root_alias = self.tables[0]
|
|
|
|
seen = {None: root_alias}
|
2009-05-29 12:35:10 +08:00
|
|
|
|
2009-03-04 13:34:01 +08:00
|
|
|
for field, model in opts.get_fields_with_model():
|
|
|
|
if model not in seen:
|
2012-12-17 20:02:41 +08:00
|
|
|
self.join_parent_model(opts, model, root_alias, seen)
|
2009-03-04 13:34:01 +08:00
|
|
|
self.included_inherited_models = seen
|
|
|
|
|
2012-12-17 20:02:41 +08:00
|
|
|
def join_parent_model(self, opts, model, alias, seen):
|
|
|
|
"""
|
|
|
|
Makes sure the given 'model' is joined in the query. If 'model' isn't
|
|
|
|
a parent of 'opts' or if it is None this method is a no-op.
|
|
|
|
|
|
|
|
The 'alias' is the root alias for starting the join, 'seen' is a dict
|
2012-12-22 02:07:13 +08:00
|
|
|
of model -> alias of existing joins. It must also contain a mapping
|
|
|
|
of None -> some alias. This will be returned in the no-op case.
|
2012-12-17 20:02:41 +08:00
|
|
|
"""
|
|
|
|
if model in seen:
|
|
|
|
return seen[model]
|
|
|
|
chain = opts.get_base_chain(model)
|
|
|
|
if chain is None:
|
|
|
|
return alias
|
2013-06-16 01:31:46 +08:00
|
|
|
curr_opts = opts
|
2012-12-17 20:02:41 +08:00
|
|
|
for int_model in chain:
|
|
|
|
if int_model in seen:
|
|
|
|
return seen[int_model]
|
|
|
|
# Proxy model have elements in base chain
|
|
|
|
# with no parents, assign the new options
|
|
|
|
# object and skip to the next base in that
|
|
|
|
# case
|
2013-06-16 01:31:46 +08:00
|
|
|
if not curr_opts.parents[int_model]:
|
|
|
|
curr_opts = int_model._meta
|
2012-12-17 20:02:41 +08:00
|
|
|
continue
|
2013-06-16 01:31:46 +08:00
|
|
|
link_field = curr_opts.get_ancestor_link(int_model)
|
|
|
|
_, _, _, joins, _ = self.setup_joins(
|
|
|
|
[link_field.name], curr_opts, alias)
|
|
|
|
curr_opts = int_model._meta
|
|
|
|
alias = seen[int_model] = joins[-1]
|
2012-12-22 02:07:13 +08:00
|
|
|
return alias or seen[None]
|
2012-12-17 20:02:41 +08:00
|
|
|
|
2009-03-04 13:34:01 +08:00
|
|
|
def remove_inherited_models(self):
|
|
|
|
"""
|
|
|
|
Undoes the effects of setup_inherited_models(). Should be called
|
|
|
|
whenever select columns (self.select) are set explicitly.
|
|
|
|
"""
|
|
|
|
for key, alias in self.included_inherited_models.items():
|
|
|
|
if key:
|
|
|
|
self.unref_alias(alias)
|
|
|
|
self.included_inherited_models = {}
|
|
|
|
|
2009-01-15 19:06:34 +08:00
|
|
|
def add_aggregate(self, aggregate, model, alias, is_summary):
|
|
|
|
"""
|
|
|
|
Adds a single aggregate expression to the Query
|
|
|
|
"""
|
|
|
|
opts = model._meta
|
|
|
|
field_list = aggregate.lookup.split(LOOKUP_SEP)
|
2013-08-21 19:25:19 +08:00
|
|
|
if len(field_list) == 1 and self._aggregates and aggregate.lookup in self.aggregates:
|
2009-01-15 19:06:34 +08:00
|
|
|
# Aggregate is over an annotation
|
|
|
|
field_name = field_list[0]
|
|
|
|
col = field_name
|
2009-02-23 22:47:59 +08:00
|
|
|
source = self.aggregates[field_name]
|
2009-04-11 20:09:34 +08:00
|
|
|
if not is_summary:
|
|
|
|
raise FieldError("Cannot compute %s('%s'): '%s' is an aggregate" % (
|
|
|
|
aggregate.name, field_name, field_name))
|
2009-04-08 21:19:48 +08:00
|
|
|
elif ((len(field_list) > 1) or
|
|
|
|
(field_list[0] not in [i.name for i in opts.fields]) or
|
|
|
|
self.group_by is None or
|
|
|
|
not is_summary):
|
|
|
|
# If:
|
|
|
|
# - the field descriptor has more than one part (foo__bar), or
|
|
|
|
# - the field descriptor is referencing an m2m/m2o field, or
|
|
|
|
# - this is a reference to a model field (possibly inherited), or
|
|
|
|
# - this is an annotation over a model field
|
|
|
|
# then we need to explore the joins that are required.
|
|
|
|
|
2013-09-25 00:37:55 +08:00
|
|
|
# Join promotion note - we must not remove any rows here, so use
|
|
|
|
# outer join if there isn't any existing join.
|
2013-03-25 00:40:40 +08:00
|
|
|
field, sources, opts, join_list, path = self.setup_joins(
|
2013-09-25 00:37:55 +08:00
|
|
|
field_list, opts, self.get_initial_alias(), outer_if_first=True)
|
2009-01-15 19:06:34 +08:00
|
|
|
|
|
|
|
# Process the join chain to see if it can be trimmed
|
2013-03-25 00:40:40 +08:00
|
|
|
targets, _, join_list = self.trim_joins(sources, join_list, path)
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2013-03-25 00:40:40 +08:00
|
|
|
col = targets[0].column
|
|
|
|
source = sources[0]
|
|
|
|
col = (join_list[-1], col)
|
2009-01-15 19:06:34 +08:00
|
|
|
else:
|
2009-04-08 21:19:48 +08:00
|
|
|
# The simplest cases. No joins required -
|
|
|
|
# just reference the provided column alias.
|
2009-01-15 19:06:34 +08:00
|
|
|
field_name = field_list[0]
|
|
|
|
source = opts.get_field(field_name)
|
2009-04-08 21:19:48 +08:00
|
|
|
col = field_name
|
2013-02-20 05:58:09 +08:00
|
|
|
# We want to have the alias in SELECT clause even if mask is set.
|
|
|
|
self.append_aggregate_mask([alias])
|
2009-01-15 19:06:34 +08:00
|
|
|
|
|
|
|
# Add the aggregate to the query
|
|
|
|
aggregate.add_to_query(self, alias, col=col, source=source, is_summary=is_summary)
|
|
|
|
|
2013-08-13 19:11:52 +08:00
|
|
|
def prepare_lookup_value(self, value, lookup_type, can_reuse):
|
|
|
|
# Interpret '__exact=None' as the sql 'is NULL'; otherwise, reject all
|
|
|
|
# uses of None as a query value.
|
|
|
|
if value is None:
|
|
|
|
if lookup_type != 'exact':
|
|
|
|
raise ValueError("Cannot use None as a query value")
|
|
|
|
lookup_type = 'isnull'
|
|
|
|
value = True
|
|
|
|
elif callable(value):
|
|
|
|
value = value()
|
|
|
|
elif isinstance(value, ExpressionNode):
|
|
|
|
# If value is a query expression, evaluate it
|
|
|
|
value = SQLEvaluator(value, self, reuse=can_reuse)
|
|
|
|
if hasattr(value, 'query') and hasattr(value.query, 'bump_prefix'):
|
|
|
|
value = value._clone()
|
|
|
|
value.query.bump_prefix(self)
|
|
|
|
if hasattr(value, 'bump_prefix'):
|
|
|
|
value = value.clone()
|
|
|
|
value.bump_prefix(self)
|
|
|
|
# For Oracle '' is equivalent to null. The check needs to be done
|
|
|
|
# at this stage because join promotion can't be done at compiler
|
|
|
|
# stage. Using DEFAULT_DB_ALIAS isn't nice, but it is the best we
|
|
|
|
# can do here. Similar thing is done in is_nullable(), too.
|
|
|
|
if (connections[DEFAULT_DB_ALIAS].features.interprets_empty_strings_as_nulls and
|
|
|
|
lookup_type == 'exact' and value == ''):
|
|
|
|
value = True
|
|
|
|
lookup_type = 'isnull'
|
|
|
|
return value, lookup_type
|
|
|
|
|
|
|
|
def solve_lookup_type(self, lookup):
|
|
|
|
"""
|
|
|
|
Solve the lookup type from the lookup (eg: 'foobar__id__icontains')
|
|
|
|
"""
|
|
|
|
lookup_type = 'exact' # Default lookup type
|
|
|
|
lookup_parts = lookup.split(LOOKUP_SEP)
|
|
|
|
num_parts = len(lookup_parts)
|
|
|
|
if (len(lookup_parts) > 1 and lookup_parts[-1] in self.query_terms
|
2013-08-21 19:25:19 +08:00
|
|
|
and (not self._aggregates or lookup not in self._aggregates)):
|
2013-08-13 19:11:52 +08:00
|
|
|
# Traverse the lookup query to distinguish related fields from
|
|
|
|
# lookup types.
|
|
|
|
lookup_model = self.model
|
|
|
|
for counter, field_name in enumerate(lookup_parts):
|
|
|
|
try:
|
|
|
|
lookup_field = lookup_model._meta.get_field(field_name)
|
|
|
|
except FieldDoesNotExist:
|
|
|
|
# Not a field. Bail out.
|
|
|
|
lookup_type = lookup_parts.pop()
|
|
|
|
break
|
|
|
|
# Unless we're at the end of the list of lookups, let's attempt
|
|
|
|
# to continue traversing relations.
|
|
|
|
if (counter + 1) < num_parts:
|
|
|
|
try:
|
|
|
|
lookup_model = lookup_field.rel.to
|
|
|
|
except AttributeError:
|
|
|
|
# Not a related field. Bail out.
|
|
|
|
lookup_type = lookup_parts.pop()
|
|
|
|
break
|
|
|
|
return lookup_type, lookup_parts
|
|
|
|
|
2013-09-25 00:37:55 +08:00
|
|
|
def promote_filter_joins(self, join_list, can_reuse, lookup_type, value,
|
|
|
|
current_negated, connector):
|
|
|
|
# If the comparison is against NULL, we may need to use some left
|
|
|
|
# outer joins when creating the join chain.
|
|
|
|
#
|
|
|
|
# The logic here is that every isnull lookup in non-negated case is
|
|
|
|
# promoted when the connector is OR. In the AND case we do this only
|
|
|
|
# for first creation of the join. Join demotion happens reverse to
|
|
|
|
# this - demote always in AND case, first use only in OR case.
|
|
|
|
#
|
|
|
|
# In the OR case, a null row for the join can yield results for isnull
|
|
|
|
# lookup. But in the AND case that can't happen (assuming the other
|
|
|
|
# joins require non-null values) - if the join produces null row, then
|
|
|
|
# the ANDed condition that requires non-null value will not match, and
|
|
|
|
# hence the whole condition will not match.
|
|
|
|
#
|
|
|
|
# Consider case: (a__something & a__isnull=True)
|
|
|
|
#
|
|
|
|
# If a is null here, then a__something can't match anything (unless
|
|
|
|
# it also requires outer join), and thus the join doesn't need to be
|
|
|
|
# promoted by a__isnull.
|
|
|
|
#
|
|
|
|
# The connector isn't the only condition for removing join promotion.
|
|
|
|
# The already created joins also play a role here. Above, in the
|
|
|
|
# AND case, we don't want to promote the isnull lookup. But if we have
|
|
|
|
# only (a__isnull), then we must promote it. To see if a join needs
|
|
|
|
# to be promoted we use the seen joins inside this filter clause. That
|
|
|
|
# is contained in can_reuse - those are actually joins that have been
|
|
|
|
# built by this filter clause.
|
|
|
|
#
|
|
|
|
# Similar reasoning applies for join demotion, exception we demote
|
|
|
|
# joins in the AND case always, and never demote them in the OR case.
|
|
|
|
#
|
|
|
|
# Some examples: (a__name__isnull=True | a__type=1)
|
|
|
|
# When a__name__isnull is seen it is promoted (it is first creation of
|
|
|
|
# that join). a__type will not demote the join as it isn't first
|
|
|
|
# "a" join in the filter condition, and this is ORed query.
|
|
|
|
# (a__name__isnull=True & a__type=1)
|
|
|
|
# Here again a__name__isnull will create an outer join, but now a__type
|
|
|
|
# will demote the join back to inner join as the connector is AND.
|
|
|
|
# (a__type=1 & a__name__isnull=True)
|
|
|
|
# a__type will create inner join, a__name__isnull will not promote it
|
|
|
|
# to outer join as this is AND case and this isn't first use of the
|
|
|
|
# join. For completeness:
|
|
|
|
# (a__type=1 | a__name__isnull=True)
|
|
|
|
# The join for a__type is created as inner join. The join is promoted
|
|
|
|
# by a__name__isnull (ORed query => always promote isnull=True joins)
|
|
|
|
|
|
|
|
if lookup_type == 'isnull' and value is True and not current_negated:
|
|
|
|
promotable_joins = join_list if connector == OR else ()
|
|
|
|
if connector == AND and can_reuse is not None:
|
|
|
|
promotable_joins = (j for j in join_list if j not in can_reuse)
|
|
|
|
self.promote_joins(promotable_joins)
|
|
|
|
else:
|
|
|
|
demotable_joins = () if connector == OR else set(join_list)
|
|
|
|
if connector == OR and can_reuse is not None:
|
|
|
|
demotable_joins = set(j for j in join_list if j not in can_reuse)
|
|
|
|
for j in join_list:
|
|
|
|
if self.alias_map[j].join_type == self.LOUTER and j in demotable_joins:
|
|
|
|
self.alias_map[j] = self.alias_map[j]._replace(join_type=self.INNER)
|
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
def build_filter(self, filter_expr, branch_negated=False, current_negated=False,
|
2013-09-25 00:37:55 +08:00
|
|
|
can_reuse=None, connector=AND):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
Builds a WhereNode for a single filter clause, but doesn't add it
|
|
|
|
to this Query. Query.add_q() will then add this filter to the where
|
|
|
|
or having Node.
|
|
|
|
|
|
|
|
The 'branch_negated' tells us if the current branch contains any
|
|
|
|
negations. This will be used to determine if subqueries are needed.
|
|
|
|
|
|
|
|
The 'current_negated' is used to determine if the current filter is
|
|
|
|
negated or not and this will be used to determine if IS NULL filtering
|
|
|
|
is needed.
|
|
|
|
|
|
|
|
The difference between current_netageted and branch_negated is that
|
|
|
|
branch_negated is set on first negation, but current_negated is
|
|
|
|
flipped for each negation.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
Note that add_filter will not do any negating itself, that is done
|
|
|
|
upper in the code by add_q().
|
2008-04-28 12:29:06 +08:00
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
The 'can_reuse' is a set of reusable joins for multijoins.
|
|
|
|
|
|
|
|
The method will create a filter clause that can be added to the current
|
|
|
|
query. However, if the filter isn't added to the query then the caller
|
|
|
|
is responsible for unreffing the joins used.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
arg, value = filter_expr
|
2013-08-13 19:11:52 +08:00
|
|
|
lookup_type, parts = self.solve_lookup_type(arg)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not parts:
|
|
|
|
raise FieldError("Cannot parse keyword query %r" % arg)
|
|
|
|
|
2012-02-05 15:11:53 +08:00
|
|
|
# Work out the lookup type and remove it from the end of 'parts',
|
|
|
|
# if necessary.
|
2013-08-13 19:11:52 +08:00
|
|
|
value, lookup_type = self.prepare_lookup_value(value, lookup_type, can_reuse)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
clause = self.where_class()
|
2013-08-21 19:25:19 +08:00
|
|
|
if self._aggregates:
|
|
|
|
for alias, aggregate in self.aggregates.items():
|
|
|
|
if alias in (parts[0], LOOKUP_SEP.join(parts)):
|
|
|
|
clause.add((aggregate, lookup_type, value), AND)
|
|
|
|
return clause
|
2009-01-15 19:06:34 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
opts = self.get_meta()
|
|
|
|
alias = self.get_initial_alias()
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
allow_many = not branch_negated
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
try:
|
2013-03-25 00:40:40 +08:00
|
|
|
field, sources, opts, join_list, path = self.setup_joins(
|
2013-08-13 19:11:52 +08:00
|
|
|
parts, opts, alias, can_reuse, allow_many,)
|
2012-04-29 00:09:37 +08:00
|
|
|
except MultiJoin as e:
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
return self.split_exclude(filter_expr, LOOKUP_SEP.join(parts[:e.level]),
|
|
|
|
can_reuse, e.names_with_path)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-09-25 00:37:55 +08:00
|
|
|
self.promote_filter_joins(join_list, can_reuse, lookup_type, value,
|
|
|
|
current_negated, connector)
|
|
|
|
if can_reuse is not None:
|
|
|
|
can_reuse.update(join_list)
|
2009-03-06 10:02:09 +08:00
|
|
|
|
|
|
|
# Process the join list to see if we can remove any inner joins from
|
2012-08-25 21:33:07 +08:00
|
|
|
# the far end (fewer tables in a query is better). Note that join
|
|
|
|
# promotion must happen before join trimming to have the join type
|
|
|
|
# information available when reusing joins.
|
2013-03-25 00:40:40 +08:00
|
|
|
targets, alias, join_list = self.trim_joins(sources, join_list, path)
|
|
|
|
|
|
|
|
if hasattr(field, 'get_lookup_constraint'):
|
|
|
|
constraint = field.get_lookup_constraint(self.where_class, alias, targets, sources,
|
|
|
|
lookup_type, value)
|
|
|
|
else:
|
|
|
|
constraint = (Constraint(alias, targets[0].column, field), lookup_type, value)
|
|
|
|
clause.add(constraint, AND)
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
if current_negated and (lookup_type != 'isnull' or value is False):
|
2012-08-22 02:54:14 +08:00
|
|
|
self.promote_joins(join_list)
|
2013-02-28 21:04:12 +08:00
|
|
|
if (lookup_type != 'isnull' and (
|
2013-03-25 00:40:40 +08:00
|
|
|
self.is_nullable(targets[0]) or
|
|
|
|
self.alias_map[join_list[-1]].join_type == self.LOUTER)):
|
2013-02-19 10:21:29 +08:00
|
|
|
# The condition added here will be SQL like this:
|
|
|
|
# NOT (col IS NOT NULL), where the first NOT is added in
|
|
|
|
# upper layers of code. The reason for addition is that if col
|
|
|
|
# is null, then col != someval will result in SQL "unknown"
|
|
|
|
# which isn't the same as in Python. The Python None handling
|
|
|
|
# is wanted, and it can be gotten by
|
|
|
|
# (col IS NULL OR col != someval)
|
|
|
|
# <=>
|
|
|
|
# NOT (col IS NOT NULL AND col = someval).
|
2013-03-25 00:40:40 +08:00
|
|
|
clause.add((Constraint(alias, targets[0].column, None), 'isnull', False), AND)
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
return clause
|
|
|
|
|
|
|
|
def add_filter(self, filter_clause):
|
2013-09-25 00:37:55 +08:00
|
|
|
self.where.add(self.build_filter(filter_clause, can_reuse=self.used_aliases), 'AND')
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
|
|
|
|
def need_having(self, obj):
|
|
|
|
"""
|
|
|
|
Returns whether or not all elements of this q_object need to be put
|
|
|
|
together in the HAVING clause.
|
|
|
|
"""
|
2013-08-21 19:25:19 +08:00
|
|
|
if not self._aggregates:
|
|
|
|
return False
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
if not isinstance(obj, Node):
|
|
|
|
return (refs_aggregate(obj[0].split(LOOKUP_SEP), self.aggregates)
|
|
|
|
or (hasattr(obj[1], 'contains_aggregate')
|
|
|
|
and obj[1].contains_aggregate(self.aggregates)))
|
|
|
|
return any(self.need_having(c) for c in obj.children)
|
|
|
|
|
|
|
|
def split_having_parts(self, q_object, negated=False):
|
|
|
|
"""
|
|
|
|
Returns a list of q_objects which need to go into the having clause
|
|
|
|
instead of the where clause. Removes the splitted out nodes from the
|
|
|
|
given q_object. Note that the q_object is altered, so cloning it is
|
|
|
|
needed.
|
|
|
|
"""
|
|
|
|
having_parts = []
|
|
|
|
for c in q_object.children[:]:
|
|
|
|
# When constucting the having nodes we need to take care to
|
|
|
|
# preserve the negation status from the upper parts of the tree
|
|
|
|
if isinstance(c, Node):
|
|
|
|
# For each negated child, flip the in_negated flag.
|
|
|
|
in_negated = c.negated ^ negated
|
|
|
|
if c.connector == OR and self.need_having(c):
|
|
|
|
# A subtree starting from OR clause must go into having in
|
|
|
|
# whole if any part of that tree references an aggregate.
|
|
|
|
q_object.children.remove(c)
|
|
|
|
having_parts.append(c)
|
|
|
|
c.negated = in_negated
|
|
|
|
else:
|
|
|
|
having_parts.extend(
|
|
|
|
self.split_having_parts(c, in_negated)[1])
|
|
|
|
elif self.need_having(c):
|
|
|
|
q_object.children.remove(c)
|
|
|
|
new_q = self.where_class(children=[c], negated=negated)
|
|
|
|
having_parts.append(new_q)
|
|
|
|
return q_object, having_parts
|
|
|
|
|
|
|
|
def add_q(self, q_object):
|
|
|
|
"""
|
|
|
|
A preprocessor for the internal _add_q(). Responsible for
|
|
|
|
splitting the given q_object into where and having parts and
|
|
|
|
setting up some internal variables.
|
|
|
|
"""
|
|
|
|
if not self.need_having(q_object):
|
|
|
|
where_part, having_parts = q_object, []
|
|
|
|
else:
|
|
|
|
where_part, having_parts = self.split_having_parts(
|
|
|
|
q_object.clone(), q_object.negated)
|
2013-09-25 00:37:55 +08:00
|
|
|
clause = self._add_q(where_part, self.used_aliases)
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
self.where.add(clause, AND)
|
|
|
|
for hp in having_parts:
|
2013-09-25 00:37:55 +08:00
|
|
|
clause = self._add_q(hp, self.used_aliases)
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
self.having.add(clause, AND)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
def _add_q(self, q_object, used_aliases, branch_negated=False,
|
|
|
|
current_negated=False):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Adds a Q-object to the current filter.
|
|
|
|
"""
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
connector = q_object.connector
|
|
|
|
current_negated = current_negated ^ q_object.negated
|
|
|
|
branch_negated = branch_negated or q_object.negated
|
|
|
|
# Note that if the connector happens to match what we have already in
|
|
|
|
# the tree, the add will be a no-op.
|
|
|
|
target_clause = self.where_class(connector=connector,
|
|
|
|
negated=q_object.negated)
|
2011-01-11 09:00:50 +08:00
|
|
|
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
if connector == OR:
|
|
|
|
alias_usage_counts = dict()
|
|
|
|
aliases_before = set(self.tables)
|
|
|
|
for child in q_object.children:
|
2012-08-25 19:13:37 +08:00
|
|
|
if connector == OR:
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
refcounts_before = self.alias_refcount.copy()
|
|
|
|
if isinstance(child, Node):
|
|
|
|
child_clause = self._add_q(
|
|
|
|
child, used_aliases, branch_negated,
|
|
|
|
current_negated)
|
|
|
|
else:
|
|
|
|
child_clause = self.build_filter(
|
|
|
|
child, can_reuse=used_aliases, branch_negated=branch_negated,
|
2013-09-25 00:37:55 +08:00
|
|
|
current_negated=current_negated, connector=connector)
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
target_clause.add(child_clause, connector)
|
|
|
|
if connector == OR:
|
|
|
|
used = alias_diff(refcounts_before, self.alias_refcount)
|
|
|
|
for alias in used:
|
|
|
|
alias_usage_counts[alias] = alias_usage_counts.get(alias, 0) + 1
|
|
|
|
if connector == OR:
|
|
|
|
self.promote_disjunction(aliases_before, alias_usage_counts,
|
|
|
|
len(q_object.children))
|
|
|
|
return target_clause
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-06-19 02:14:07 +08:00
|
|
|
def names_to_path(self, names, opts, allow_many):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2012-08-25 21:33:07 +08:00
|
|
|
Walks the names path and turns them PathInfo tuples. Note that a
|
|
|
|
single name in 'names' can generate multiple PathInfos (m2m for
|
|
|
|
example).
|
2012-11-24 22:19:55 +08:00
|
|
|
|
2012-08-25 21:33:07 +08:00
|
|
|
'names' is the path of names to travle, 'opts' is the model Options we
|
2013-06-19 02:14:07 +08:00
|
|
|
start the name resolving from, 'allow_many' is as for setup_joins().
|
2012-11-24 22:19:55 +08:00
|
|
|
|
2012-08-25 21:33:07 +08:00
|
|
|
Returns a list of PathInfo tuples. In addition returns the final field
|
|
|
|
(the last used join field), and target (which is a field guaranteed to
|
|
|
|
contain the same value as the final field).
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2013-02-18 07:56:24 +08:00
|
|
|
path, names_with_path = [], []
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for pos, name in enumerate(names):
|
|
|
|
if name == 'pk':
|
|
|
|
name = opts.pk.name
|
|
|
|
try:
|
|
|
|
field, model, direct, m2m = opts.get_field_by_name(name)
|
|
|
|
except FieldDoesNotExist:
|
2013-06-19 02:14:07 +08:00
|
|
|
available = opts.get_all_field_names() + list(self.aggregate_select)
|
|
|
|
raise FieldError("Cannot resolve keyword %r into field. "
|
|
|
|
"Choices are: %s" % (name, ", ".join(available)))
|
2012-08-25 21:33:07 +08:00
|
|
|
# Check if we need any joins for concrete inheritance cases (the
|
|
|
|
# field lives in parent, but we are currently in one of its
|
|
|
|
# children)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if model:
|
|
|
|
# The field lives on a base class of the current model.
|
2009-05-29 12:35:10 +08:00
|
|
|
# Skip the chain of proxy to the concrete proxied model
|
2012-02-22 13:26:50 +08:00
|
|
|
proxied_model = opts.concrete_model
|
2009-05-11 18:10:03 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for int_model in opts.get_base_chain(model):
|
2009-03-18 17:47:08 +08:00
|
|
|
if int_model is proxied_model:
|
|
|
|
opts = int_model._meta
|
|
|
|
else:
|
2012-08-25 21:33:07 +08:00
|
|
|
final_field = opts.parents[int_model]
|
2013-03-25 00:40:40 +08:00
|
|
|
targets = (final_field.rel.get_related_field(),)
|
2009-03-18 17:47:08 +08:00
|
|
|
opts = int_model._meta
|
2013-03-25 00:40:40 +08:00
|
|
|
path.append(PathInfo(final_field.model._meta, opts, targets, final_field, False, True))
|
2012-12-17 23:09:07 +08:00
|
|
|
if hasattr(field, 'get_path_info'):
|
2013-03-25 00:40:40 +08:00
|
|
|
pathinfos = field.get_path_info()
|
2013-02-18 07:56:24 +08:00
|
|
|
if not allow_many:
|
|
|
|
for inner_pos, p in enumerate(pathinfos):
|
|
|
|
if p.m2m:
|
|
|
|
names_with_path.append((name, pathinfos[0:inner_pos + 1]))
|
|
|
|
raise MultiJoin(pos + 1, names_with_path)
|
2013-03-25 00:40:40 +08:00
|
|
|
last = pathinfos[-1]
|
2012-12-17 23:09:07 +08:00
|
|
|
path.extend(pathinfos)
|
2013-03-25 00:40:40 +08:00
|
|
|
final_field = last.join_field
|
|
|
|
opts = last.to_opts
|
|
|
|
targets = last.target_fields
|
2013-02-18 07:56:24 +08:00
|
|
|
names_with_path.append((name, pathinfos))
|
2012-12-17 23:09:07 +08:00
|
|
|
else:
|
2012-08-25 21:33:07 +08:00
|
|
|
# Local non-relational field.
|
2013-03-25 00:40:40 +08:00
|
|
|
final_field = field
|
|
|
|
targets = (field,)
|
2012-08-25 21:33:07 +08:00
|
|
|
break
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
if pos != len(names) - 1:
|
2008-12-09 15:03:52 +08:00
|
|
|
if pos == len(names) - 2:
|
2012-08-25 21:33:07 +08:00
|
|
|
raise FieldError(
|
|
|
|
"Join on field %r not permitted. Did you misspell %r for "
|
|
|
|
"the lookup type?" % (name, names[pos + 1]))
|
2008-12-09 15:03:52 +08:00
|
|
|
else:
|
|
|
|
raise FieldError("Join on field %r not permitted." % name)
|
2013-03-25 00:40:40 +08:00
|
|
|
return path, final_field, targets
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-12-21 03:25:48 +08:00
|
|
|
def setup_joins(self, names, opts, alias, can_reuse=None, allow_many=True,
|
2013-06-19 02:14:07 +08:00
|
|
|
outer_if_first=False):
|
2009-03-06 10:02:09 +08:00
|
|
|
"""
|
2012-08-25 21:33:07 +08:00
|
|
|
Compute the necessary table joins for the passage through the fields
|
|
|
|
given in 'names'. 'opts' is the Options class for the current model
|
|
|
|
(which gives the table we are starting from), 'alias' is the alias for
|
|
|
|
the table to start the joining from.
|
|
|
|
|
|
|
|
The 'can_reuse' defines the reverse foreign key joins we can reuse. It
|
2012-12-21 03:25:48 +08:00
|
|
|
can be None in which case all joins are reusable or a set of aliases
|
|
|
|
that can be reused. Note that non-reverse foreign keys are always
|
|
|
|
reusable when using setup_joins().
|
2012-08-25 21:33:07 +08:00
|
|
|
|
|
|
|
If 'allow_many' is False, then any reverse foreign key seen will
|
|
|
|
generate a MultiJoin exception.
|
|
|
|
|
|
|
|
Returns the final field involved in the joins, the target field (used
|
|
|
|
for any 'where' constraint), the final 'opts' value, the joins and the
|
|
|
|
field path travelled to generate the joins.
|
2009-03-06 10:02:09 +08:00
|
|
|
|
2012-08-25 21:33:07 +08:00
|
|
|
The target field is the field containing the concrete value. Final
|
|
|
|
field can be something different, for example foreign key pointing to
|
|
|
|
that value. Final field is needed for example in some value
|
|
|
|
conversions (convert 'obj' in fk__id=obj to pk val using the foreign
|
|
|
|
key field for example).
|
|
|
|
"""
|
|
|
|
joins = [alias]
|
|
|
|
# First, generate the path for the names
|
2013-03-25 00:40:40 +08:00
|
|
|
path, final_field, targets = self.names_to_path(
|
2013-06-19 02:14:07 +08:00
|
|
|
names, opts, allow_many)
|
2012-08-25 21:33:07 +08:00
|
|
|
# Then, add the path to the query's joins. Note that we can't trim
|
|
|
|
# joins at this stage - we will need the information about join type
|
|
|
|
# of the trimmed joins.
|
|
|
|
for pos, join in enumerate(path):
|
2012-12-17 23:09:07 +08:00
|
|
|
opts = join.to_opts
|
|
|
|
if join.direct:
|
2013-03-25 00:40:40 +08:00
|
|
|
nullable = self.is_nullable(join.join_field)
|
2012-08-25 21:33:07 +08:00
|
|
|
else:
|
|
|
|
nullable = True
|
2013-03-25 00:40:40 +08:00
|
|
|
connection = alias, opts.db_table, join.join_field.get_joining_columns()
|
2012-12-17 23:09:07 +08:00
|
|
|
reuse = can_reuse if join.m2m else None
|
2013-06-16 01:31:46 +08:00
|
|
|
alias = self.join(
|
|
|
|
connection, reuse=reuse, nullable=nullable, join_field=join.join_field,
|
|
|
|
outer_if_first=outer_if_first)
|
2012-08-25 21:33:07 +08:00
|
|
|
joins.append(alias)
|
2013-03-25 00:40:40 +08:00
|
|
|
if hasattr(final_field, 'field'):
|
|
|
|
final_field = final_field.field
|
|
|
|
return final_field, targets, opts, joins, path
|
2009-03-06 10:02:09 +08:00
|
|
|
|
2013-03-25 00:40:40 +08:00
|
|
|
def trim_joins(self, targets, joins, path):
|
2012-08-25 21:33:07 +08:00
|
|
|
"""
|
|
|
|
The 'target' parameter is the final field being joined to, 'joins'
|
|
|
|
is the full list of join aliases. The 'path' contain the PathInfos
|
|
|
|
used to create the joins.
|
2011-08-23 11:38:42 +08:00
|
|
|
|
2013-02-19 10:21:29 +08:00
|
|
|
Returns the final target field and table alias and the new active
|
2012-08-25 21:33:07 +08:00
|
|
|
joins.
|
|
|
|
|
|
|
|
We will always trim any direct join if we have the target column
|
|
|
|
available already in the previous table. Reverse joins can't be
|
|
|
|
trimmed as we don't know if there is anything on the other side of
|
|
|
|
the join.
|
|
|
|
"""
|
2013-03-25 00:40:40 +08:00
|
|
|
for pos, info in enumerate(reversed(path)):
|
|
|
|
if len(joins) == 1 or not info.direct:
|
2009-01-15 19:06:34 +08:00
|
|
|
break
|
2013-03-25 00:40:40 +08:00
|
|
|
join_targets = set(t.column for t in info.join_field.foreign_related_fields)
|
|
|
|
cur_targets = set(t.column for t in targets)
|
|
|
|
if not cur_targets.issubset(join_targets):
|
|
|
|
break
|
|
|
|
targets = tuple(r[0] for r in info.join_field.related_fields if r[1].column in cur_targets)
|
|
|
|
self.unref_alias(joins.pop())
|
|
|
|
return targets, joins[-1], joins
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2013-02-18 07:56:24 +08:00
|
|
|
def split_exclude(self, filter_expr, prefix, can_reuse, names_with_path):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
When doing an exclude against any kind of N-to-many relation, we need
|
|
|
|
to use a subquery. This method constructs the nested query, given the
|
|
|
|
original exclude filter (filter_expr) and the portion up to the first
|
|
|
|
N-to-many relation field.
|
2012-08-21 04:03:58 +08:00
|
|
|
|
|
|
|
As an example we could have original filter ~Q(child__name='foo').
|
2013-02-18 07:56:24 +08:00
|
|
|
We would get here with filter_expr = child__name, prefix = child and
|
|
|
|
can_reuse is a set of joins usable for filters in the original query.
|
2012-08-21 04:03:58 +08:00
|
|
|
|
2013-02-18 07:56:24 +08:00
|
|
|
We will turn this into equivalent of:
|
2013-02-19 10:21:29 +08:00
|
|
|
WHERE NOT (pk IN (SELECT parent_id FROM thetable
|
|
|
|
WHERE name = 'foo' AND parent_id IS NOT NULL))
|
2012-08-21 04:03:58 +08:00
|
|
|
|
|
|
|
It might be worth it to consider using WHERE NOT EXISTS as that has
|
|
|
|
saner null handling, and is easier for the backend's optimizer to
|
|
|
|
handle.
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
2013-02-18 07:56:24 +08:00
|
|
|
# Generate the inner query.
|
2009-12-22 23:18:51 +08:00
|
|
|
query = Query(self.model)
|
2013-09-25 00:37:55 +08:00
|
|
|
query.add_filter(filter_expr)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
query.clear_ordering(True)
|
2013-02-18 07:56:24 +08:00
|
|
|
# Try to have as simple as possible subquery -> trim leading joins from
|
|
|
|
# the subquery.
|
2013-06-06 05:29:44 +08:00
|
|
|
trimmed_prefix, contains_louter = query.trim_start(names_with_path)
|
|
|
|
query.remove_inherited_models()
|
|
|
|
|
2013-02-18 07:56:24 +08:00
|
|
|
# Add extra check to make sure the selected field will not be null
|
2011-02-08 22:06:02 +08:00
|
|
|
# since we are adding a IN <subquery> clause. This prevents the
|
|
|
|
# database from tripping over IN (...,NULL,...) selects and returning
|
|
|
|
# nothing
|
2013-02-19 10:21:29 +08:00
|
|
|
if self.is_nullable(query.select[0].field):
|
|
|
|
alias, col = query.select[0].col
|
2013-02-28 21:04:12 +08:00
|
|
|
query.where.add((Constraint(alias, col, query.select[0].field), 'isnull', False), AND)
|
2011-02-08 22:06:02 +08:00
|
|
|
|
2013-03-25 00:40:40 +08:00
|
|
|
condition = self.build_filter(
|
Refactored qs.add_q() and utils/tree.py
The sql/query.py add_q method did a lot of where/having tree hacking to
get complex queries to work correctly. The logic was refactored so that
it should be simpler to understand. The new logic should also produce
leaner WHERE conditions.
The changes cascade somewhat, as some other parts of Django (like
add_filter() and WhereNode) expect boolean trees in certain format or
they fail to work. So to fix the add_q() one must fix utils/tree.py,
some things in add_filter(), WhereNode and so on.
This commit also fixed add_filter to see negate clauses up the path.
A query like .exclude(Q(reversefk__in=a_list)) didn't work similarly to
.filter(~Q(reversefk__in=a_list)). The reason for this is that only
the immediate parent negate clauses were seen by add_filter, and thus a
tree like AND: (NOT AND: (AND: condition)) will not be handled
correctly, as there is one intermediary AND node in the tree. The
example tree is generated by .exclude(~Q(reversefk__in=a_list)).
Still, aggregation lost connectors in OR cases, and F() objects and
aggregates in same filter clause caused GROUP BY problems on some
databases.
Fixed #17600, fixed #13198, fixed #17025, fixed #17000, fixed #11293.
2012-05-25 05:27:24 +08:00
|
|
|
('%s__in' % trimmed_prefix, query),
|
|
|
|
current_negated=True, branch_negated=True, can_reuse=can_reuse)
|
2013-06-06 05:29:44 +08:00
|
|
|
if contains_louter:
|
|
|
|
or_null_condition = self.build_filter(
|
|
|
|
('%s__isnull' % trimmed_prefix, True),
|
|
|
|
current_negated=True, branch_negated=True, can_reuse=can_reuse)
|
|
|
|
condition.add(or_null_condition, OR)
|
|
|
|
# Note that the end result will be:
|
|
|
|
# (outercol NOT IN innerq AND outercol IS NOT NULL) OR outercol IS NULL.
|
|
|
|
# This might look crazy but due to how IN works, this seems to be
|
|
|
|
# correct. If the IS NOT NULL check is removed then outercol NOT
|
|
|
|
# IN will return UNKNOWN. If the IS NULL check is removed, then if
|
|
|
|
# outercol IS NULL we will not match the row.
|
2013-03-25 00:40:40 +08:00
|
|
|
return condition
|
2013-02-18 07:56:24 +08:00
|
|
|
|
2012-10-24 05:04:37 +08:00
|
|
|
def set_empty(self):
|
|
|
|
self.where = EmptyWhere()
|
|
|
|
self.having = EmptyWhere()
|
|
|
|
|
|
|
|
def is_empty(self):
|
|
|
|
return isinstance(self.where, EmptyWhere) or isinstance(self.having, EmptyWhere)
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def set_limits(self, low=None, high=None):
|
|
|
|
"""
|
|
|
|
Adjusts the limits on the rows retrieved. We use low/high to set these,
|
|
|
|
as it makes it more Pythonic to read and write. When the SQL query is
|
|
|
|
created, they are converted to the appropriate offset and limit values.
|
|
|
|
|
|
|
|
Any limits passed in here are applied relative to the existing
|
|
|
|
constraints. So low is added to the current low value and both will be
|
|
|
|
clamped to any existing high value.
|
|
|
|
"""
|
2008-07-11 20:43:27 +08:00
|
|
|
if high is not None:
|
2008-10-08 16:37:35 +08:00
|
|
|
if self.high_mark is not None:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.high_mark = min(self.high_mark, self.low_mark + high)
|
|
|
|
else:
|
|
|
|
self.high_mark = self.low_mark + high
|
2008-07-11 20:43:27 +08:00
|
|
|
if low is not None:
|
2008-10-08 16:37:35 +08:00
|
|
|
if self.high_mark is not None:
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
self.low_mark = min(self.high_mark, self.low_mark + low)
|
|
|
|
else:
|
|
|
|
self.low_mark = self.low_mark + low
|
|
|
|
|
|
|
|
def clear_limits(self):
|
|
|
|
"""
|
|
|
|
Clears any existing limits.
|
|
|
|
"""
|
|
|
|
self.low_mark, self.high_mark = 0, None
|
|
|
|
|
|
|
|
def can_filter(self):
|
|
|
|
"""
|
|
|
|
Returns True if adding filters to this instance is still possible.
|
|
|
|
|
|
|
|
Typically, this means no limits or offsets have been put on the results.
|
|
|
|
"""
|
2009-03-01 09:24:03 +08:00
|
|
|
return not self.low_mark and self.high_mark is None
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-10-10 20:58:39 +08:00
|
|
|
def clear_select_clause(self):
|
|
|
|
"""
|
|
|
|
Removes all fields from SELECT clause.
|
|
|
|
"""
|
|
|
|
self.select = []
|
|
|
|
self.default_cols = False
|
|
|
|
self.select_related = False
|
|
|
|
self.set_extra_mask(())
|
|
|
|
self.set_aggregate_mask(())
|
|
|
|
|
2009-01-08 13:49:03 +08:00
|
|
|
def clear_select_fields(self):
|
|
|
|
"""
|
|
|
|
Clears the list of fields to select (but not extra_select columns).
|
|
|
|
Some queryset types completely replace any existing list of select
|
|
|
|
columns.
|
|
|
|
"""
|
|
|
|
self.select = []
|
|
|
|
|
2011-12-23 04:42:40 +08:00
|
|
|
def add_distinct_fields(self, *field_names):
|
|
|
|
"""
|
|
|
|
Adds and resolves the given fields to the query's "distinct on" clause.
|
|
|
|
"""
|
|
|
|
self.distinct_fields = field_names
|
|
|
|
self.distinct = True
|
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def add_fields(self, field_names, allow_m2m=True):
|
|
|
|
"""
|
|
|
|
Adds the given (model) fields to the select set. The field names are
|
|
|
|
added in the order specified.
|
|
|
|
"""
|
|
|
|
alias = self.get_initial_alias()
|
|
|
|
opts = self.get_meta()
|
2009-01-15 19:06:34 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
try:
|
|
|
|
for name in field_names:
|
2013-09-25 00:37:55 +08:00
|
|
|
# Join promotion note - we must not remove any rows here, so
|
|
|
|
# if there is no existing joins, use outer join.
|
2013-03-25 00:40:40 +08:00
|
|
|
field, targets, u2, joins, path = self.setup_joins(
|
2013-09-25 00:37:55 +08:00
|
|
|
name.split(LOOKUP_SEP), opts, alias, can_reuse=None,
|
|
|
|
allow_many=allow_m2m, outer_if_first=True)
|
|
|
|
targets, final_alias, joins = self.trim_joins(targets, joins, path)
|
2013-03-25 00:40:40 +08:00
|
|
|
for target in targets:
|
|
|
|
self.select.append(SelectInfo((final_alias, target.column), target))
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
except MultiJoin:
|
|
|
|
raise FieldError("Invalid field name: '%s'" % name)
|
|
|
|
except FieldError:
|
2012-07-17 22:01:01 +08:00
|
|
|
if LOOKUP_SEP in name:
|
2012-07-17 17:24:56 +08:00
|
|
|
# For lookups spanning over relationships, show the error
|
|
|
|
# from the model on which the lookup failed.
|
|
|
|
raise
|
|
|
|
else:
|
2012-08-08 22:33:15 +08:00
|
|
|
names = sorted(opts.get_all_field_names() + list(self.extra)
|
|
|
|
+ list(self.aggregate_select))
|
2012-07-17 17:24:56 +08:00
|
|
|
raise FieldError("Cannot resolve keyword %r into field. "
|
|
|
|
"Choices are: %s" % (name, ", ".join(names)))
|
2009-03-04 13:34:01 +08:00
|
|
|
self.remove_inherited_models()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
def add_ordering(self, *ordering):
|
|
|
|
"""
|
|
|
|
Adds items from the 'ordering' sequence to the query's "order by"
|
|
|
|
clause. These items are either field names (not column names) --
|
|
|
|
possibly with a direction prefix ('-' or '?') -- or ordinals,
|
|
|
|
corresponding to column positions in the 'select' list.
|
|
|
|
|
|
|
|
If 'ordering' is empty, all ordering is cleared from the query.
|
|
|
|
"""
|
|
|
|
errors = []
|
|
|
|
for item in ordering:
|
|
|
|
if not ORDER_PATTERN.match(item):
|
|
|
|
errors.append(item)
|
|
|
|
if errors:
|
|
|
|
raise FieldError('Invalid order_by arguments: %s' % errors)
|
|
|
|
if ordering:
|
|
|
|
self.order_by.extend(ordering)
|
|
|
|
else:
|
|
|
|
self.default_ordering = False
|
|
|
|
|
2013-02-11 02:52:52 +08:00
|
|
|
def clear_ordering(self, force_empty):
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
"""
|
|
|
|
Removes any ordering settings. If 'force_empty' is True, there will be
|
|
|
|
no ordering in the resulting query (not even the model's default).
|
|
|
|
"""
|
|
|
|
self.order_by = []
|
|
|
|
self.extra_order_by = ()
|
|
|
|
if force_empty:
|
|
|
|
self.default_ordering = False
|
|
|
|
|
2009-01-15 19:06:34 +08:00
|
|
|
def set_group_by(self):
|
|
|
|
"""
|
|
|
|
Expands the GROUP BY clause required by the query.
|
|
|
|
|
|
|
|
This will usually be the set of all non-aggregate fields in the
|
|
|
|
return data. If the database backend supports grouping by the
|
|
|
|
primary key, and the query would be equivalent, the optimization
|
|
|
|
will be made automatically.
|
|
|
|
"""
|
2009-02-16 20:29:31 +08:00
|
|
|
self.group_by = []
|
2009-01-15 19:06:34 +08:00
|
|
|
|
2012-10-26 01:57:32 +08:00
|
|
|
for col, _ in self.select:
|
|
|
|
self.group_by.append(col)
|
2009-01-15 19:06:34 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def add_count_column(self):
|
|
|
|
"""
|
|
|
|
Converts the query to do count(...) or count(distinct(pk)) in order to
|
|
|
|
get its size.
|
|
|
|
"""
|
|
|
|
if not self.distinct:
|
|
|
|
if not self.select:
|
2009-01-15 19:06:34 +08:00
|
|
|
count = self.aggregates_module.Count('*', is_summary=True)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
2008-06-30 07:47:31 +08:00
|
|
|
assert len(self.select) == 1, \
|
2013-10-20 07:33:10 +08:00
|
|
|
"Cannot add count col with multiple cols in 'select': %r" % self.select
|
2012-10-26 01:57:32 +08:00
|
|
|
count = self.aggregates_module.Count(self.select[0].col)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
2013-05-14 03:40:39 +08:00
|
|
|
opts = self.get_meta()
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if not self.select:
|
2012-12-21 03:25:48 +08:00
|
|
|
count = self.aggregates_module.Count(
|
2013-03-25 00:40:40 +08:00
|
|
|
(self.join((None, opts.db_table, None)), opts.pk.column),
|
2012-12-21 03:25:48 +08:00
|
|
|
is_summary=True, distinct=True)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
else:
|
|
|
|
# Because of SQL portability issues, multi-column, distinct
|
|
|
|
# counts need a sub-query -- see get_count() for details.
|
|
|
|
assert len(self.select) == 1, \
|
2013-10-20 07:33:10 +08:00
|
|
|
"Cannot add count col with multiple cols in 'select'."
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-10-26 01:57:32 +08:00
|
|
|
count = self.aggregates_module.Count(self.select[0].col, distinct=True)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
# Distinct handling is done in Count(), so don't do it at this
|
|
|
|
# level.
|
|
|
|
self.distinct = False
|
2009-02-23 22:47:59 +08:00
|
|
|
|
|
|
|
# Set only aggregate to be the count column.
|
|
|
|
# Clear out the select cache to reflect the new unmasked aggregates.
|
2013-08-21 19:25:19 +08:00
|
|
|
self._aggregates = {None: count}
|
2009-02-23 22:47:59 +08:00
|
|
|
self.set_aggregate_mask(None)
|
2009-03-14 12:32:52 +08:00
|
|
|
self.group_by = None
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
|
|
|
def add_select_related(self, fields):
|
|
|
|
"""
|
|
|
|
Sets up the select_related data structure so that we only select
|
|
|
|
certain related models (as opposed to all models, when
|
|
|
|
self.select_related=True).
|
|
|
|
"""
|
2013-10-15 20:15:02 +08:00
|
|
|
if isinstance(self.select_related, bool):
|
|
|
|
field_dict = {}
|
|
|
|
else:
|
|
|
|
field_dict = self.select_related
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
for field in fields:
|
|
|
|
d = field_dict
|
|
|
|
for part in field.split(LOOKUP_SEP):
|
|
|
|
d = d.setdefault(part, {})
|
|
|
|
self.select_related = field_dict
|
|
|
|
self.related_select_cols = []
|
|
|
|
|
|
|
|
def add_extra(self, select, select_params, where, params, tables, order_by):
|
|
|
|
"""
|
|
|
|
Adds data to the various extra_* attributes for user-created additions
|
|
|
|
to the query.
|
|
|
|
"""
|
|
|
|
if select:
|
2008-08-18 04:07:59 +08:00
|
|
|
# We need to pair any placeholder markers in the 'select'
|
|
|
|
# dictionary with their parameters in 'select_params' so that
|
|
|
|
# subsequent updates to the select dictionary also adjust the
|
|
|
|
# parameters appropriately.
|
2013-08-03 13:41:15 +08:00
|
|
|
select_pairs = OrderedDict()
|
2008-08-18 04:07:59 +08:00
|
|
|
if select_params:
|
|
|
|
param_iter = iter(select_params)
|
|
|
|
else:
|
|
|
|
param_iter = iter([])
|
|
|
|
for name, entry in select.items():
|
2012-07-21 16:00:10 +08:00
|
|
|
entry = force_text(entry)
|
2008-08-18 04:07:59 +08:00
|
|
|
entry_params = []
|
|
|
|
pos = entry.find("%s")
|
|
|
|
while pos != -1:
|
2012-05-11 02:14:04 +08:00
|
|
|
entry_params.append(next(param_iter))
|
2008-08-18 04:07:59 +08:00
|
|
|
pos = entry.find("%s", pos + 2)
|
|
|
|
select_pairs[name] = (entry, entry_params)
|
2013-08-03 13:41:15 +08:00
|
|
|
# This is order preserving, since self.extra_select is an OrderedDict.
|
2009-04-30 23:40:09 +08:00
|
|
|
self.extra.update(select_pairs)
|
2010-02-23 12:39:39 +08:00
|
|
|
if where or params:
|
|
|
|
self.where.add(ExtraWhere(where, params), AND)
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
if tables:
|
|
|
|
self.extra_tables += tuple(tables)
|
|
|
|
if order_by:
|
|
|
|
self.extra_order_by = order_by
|
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
def clear_deferred_loading(self):
|
|
|
|
"""
|
|
|
|
Remove any fields from the deferred loading set.
|
|
|
|
"""
|
|
|
|
self.deferred_loading = (set(), True)
|
|
|
|
|
|
|
|
def add_deferred_loading(self, field_names):
|
|
|
|
"""
|
|
|
|
Add the given list of model field names to the set of fields to
|
|
|
|
exclude from loading from the database when automatic column selection
|
|
|
|
is done. The new field names are added to any existing field names that
|
|
|
|
are deferred (or removed from any existing field names that are marked
|
|
|
|
as the only ones for immediate loading).
|
|
|
|
"""
|
|
|
|
# Fields on related models are stored in the literal double-underscore
|
|
|
|
# format, so that we can use a set datastructure. We do the foo__bar
|
|
|
|
# splitting and handling when computing the SQL colum names (as part of
|
|
|
|
# get_columns()).
|
|
|
|
existing, defer = self.deferred_loading
|
|
|
|
if defer:
|
|
|
|
# Add to existing deferred names.
|
|
|
|
self.deferred_loading = existing.union(field_names), True
|
|
|
|
else:
|
|
|
|
# Remove names from the set of any existing "immediate load" names.
|
|
|
|
self.deferred_loading = existing.difference(field_names), False
|
|
|
|
|
|
|
|
def add_immediate_loading(self, field_names):
|
|
|
|
"""
|
|
|
|
Add the given list of model field names to the set of fields to
|
|
|
|
retrieve when the SQL is executed ("immediate loading" fields). The
|
|
|
|
field names replace any existing immediate loading field names. If
|
|
|
|
there are field names already specified for deferred loading, those
|
|
|
|
names are removed from the new field_names before storing the new names
|
|
|
|
for immediate loading. (That is, immediate loading overrides any
|
|
|
|
existing immediate values, but respects existing deferrals.)
|
|
|
|
"""
|
|
|
|
existing, defer = self.deferred_loading
|
2011-08-23 14:29:01 +08:00
|
|
|
field_names = set(field_names)
|
|
|
|
if 'pk' in field_names:
|
|
|
|
field_names.remove('pk')
|
2013-05-14 03:40:39 +08:00
|
|
|
field_names.add(self.get_meta().pk.name)
|
2011-08-23 14:29:01 +08:00
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
if defer:
|
|
|
|
# Remove any existing deferred names from the current set before
|
|
|
|
# setting the new names.
|
2011-08-23 14:29:01 +08:00
|
|
|
self.deferred_loading = field_names.difference(existing), False
|
2009-03-19 17:06:04 +08:00
|
|
|
else:
|
|
|
|
# Replace any existing "immediate load" field names.
|
2011-08-23 14:29:01 +08:00
|
|
|
self.deferred_loading = field_names, False
|
2009-03-19 17:06:04 +08:00
|
|
|
|
|
|
|
def get_loaded_field_names(self):
|
|
|
|
"""
|
|
|
|
If any fields are marked to be deferred, returns a dictionary mapping
|
|
|
|
models to a set of names in those fields that will be loaded. If a
|
|
|
|
model is not in the returned dictionary, none of it's fields are
|
|
|
|
deferred.
|
|
|
|
|
|
|
|
If no fields are marked for deferral, returns an empty dictionary.
|
|
|
|
"""
|
2012-06-26 23:08:42 +08:00
|
|
|
# We cache this because we call this function multiple times
|
|
|
|
# (compiler.fill_related_selections, query.iterator)
|
|
|
|
try:
|
|
|
|
return self._loaded_field_names_cache
|
|
|
|
except AttributeError:
|
|
|
|
collection = {}
|
|
|
|
self.deferred_to_data(collection, self.get_loaded_field_names_cb)
|
|
|
|
self._loaded_field_names_cache = collection
|
|
|
|
return collection
|
2009-03-19 17:06:04 +08:00
|
|
|
|
|
|
|
def get_loaded_field_names_cb(self, target, model, fields):
|
|
|
|
"""
|
|
|
|
Callback used by get_deferred_field_names().
|
|
|
|
"""
|
2013-08-30 07:20:00 +08:00
|
|
|
target[model] = set(f.name for f in fields)
|
2009-03-19 17:06:04 +08:00
|
|
|
|
2009-02-23 22:47:59 +08:00
|
|
|
def set_aggregate_mask(self, names):
|
|
|
|
"Set the mask of aggregates that will actually be returned by the SELECT"
|
2009-04-30 23:40:09 +08:00
|
|
|
if names is None:
|
|
|
|
self.aggregate_select_mask = None
|
|
|
|
else:
|
|
|
|
self.aggregate_select_mask = set(names)
|
2009-02-23 22:47:59 +08:00
|
|
|
self._aggregate_select_cache = None
|
|
|
|
|
2013-07-23 16:38:38 +08:00
|
|
|
def append_aggregate_mask(self, names):
|
|
|
|
if self.aggregate_select_mask is not None:
|
|
|
|
self.set_aggregate_mask(set(names).union(self.aggregate_select_mask))
|
|
|
|
|
2009-04-30 23:40:09 +08:00
|
|
|
def set_extra_mask(self, names):
|
|
|
|
"""
|
|
|
|
Set the mask of extra select items that will be returned by SELECT,
|
|
|
|
we don't actually remove them from the Query since they might be used
|
|
|
|
later
|
|
|
|
"""
|
|
|
|
if names is None:
|
|
|
|
self.extra_select_mask = None
|
|
|
|
else:
|
|
|
|
self.extra_select_mask = set(names)
|
|
|
|
self._extra_select_cache = None
|
|
|
|
|
2013-08-21 19:25:19 +08:00
|
|
|
@property
|
|
|
|
def aggregate_select(self):
|
2013-08-03 13:41:15 +08:00
|
|
|
"""The OrderedDict of aggregate columns that are not masked, and should
|
2009-02-23 22:47:59 +08:00
|
|
|
be used in the SELECT clause.
|
|
|
|
|
|
|
|
This result is cached for optimization purposes.
|
|
|
|
"""
|
|
|
|
if self._aggregate_select_cache is not None:
|
|
|
|
return self._aggregate_select_cache
|
2013-08-21 19:25:19 +08:00
|
|
|
elif not self._aggregates:
|
|
|
|
return {}
|
2009-02-23 22:47:59 +08:00
|
|
|
elif self.aggregate_select_mask is not None:
|
2013-08-30 07:20:00 +08:00
|
|
|
self._aggregate_select_cache = OrderedDict(
|
2013-07-08 08:39:54 +08:00
|
|
|
(k, v) for k, v in self.aggregates.items()
|
2009-02-23 22:47:59 +08:00
|
|
|
if k in self.aggregate_select_mask
|
2013-08-30 07:20:00 +08:00
|
|
|
)
|
2009-02-23 22:47:59 +08:00
|
|
|
return self._aggregate_select_cache
|
|
|
|
else:
|
|
|
|
return self.aggregates
|
|
|
|
|
2013-08-21 19:25:19 +08:00
|
|
|
@property
|
|
|
|
def extra_select(self):
|
2009-04-30 23:40:09 +08:00
|
|
|
if self._extra_select_cache is not None:
|
|
|
|
return self._extra_select_cache
|
2013-08-21 19:25:19 +08:00
|
|
|
if not self._extra:
|
|
|
|
return {}
|
2009-04-30 23:40:09 +08:00
|
|
|
elif self.extra_select_mask is not None:
|
2013-08-30 07:20:00 +08:00
|
|
|
self._extra_select_cache = OrderedDict(
|
2013-07-08 08:39:54 +08:00
|
|
|
(k, v) for k, v in self.extra.items()
|
2009-04-30 23:40:09 +08:00
|
|
|
if k in self.extra_select_mask
|
2013-08-30 07:20:00 +08:00
|
|
|
)
|
2009-04-30 23:40:09 +08:00
|
|
|
return self._extra_select_cache
|
|
|
|
else:
|
|
|
|
return self.extra
|
|
|
|
|
2013-02-18 07:56:24 +08:00
|
|
|
def trim_start(self, names_with_path):
|
|
|
|
"""
|
|
|
|
Trims joins from the start of the join path. The candidates for trim
|
2013-06-06 05:29:44 +08:00
|
|
|
are the PathInfos in names_with_path structure that are m2m joins.
|
|
|
|
|
|
|
|
Also sets the select column so the start matches the join.
|
|
|
|
|
|
|
|
This method is meant to be used for generating the subquery joins &
|
|
|
|
cols in split_exclude().
|
2013-02-18 07:56:24 +08:00
|
|
|
|
2013-06-06 05:29:44 +08:00
|
|
|
Returns a lookup usable for doing outerq.filter(lookup=self). Returns
|
|
|
|
also if the joins in the prefix contain a LEFT OUTER join.
|
2013-02-18 07:56:24 +08:00
|
|
|
_"""
|
2013-03-25 00:40:40 +08:00
|
|
|
all_paths = []
|
2013-02-18 07:56:24 +08:00
|
|
|
for _, paths in names_with_path:
|
2013-03-25 00:40:40 +08:00
|
|
|
all_paths.extend(paths)
|
2013-06-06 05:29:44 +08:00
|
|
|
contains_louter = False
|
2013-03-25 00:40:40 +08:00
|
|
|
for pos, path in enumerate(all_paths):
|
2013-06-06 05:29:44 +08:00
|
|
|
if path.m2m:
|
|
|
|
break
|
2013-03-25 00:40:40 +08:00
|
|
|
if self.alias_map[self.tables[pos + 1]].join_type == self.LOUTER:
|
2013-06-06 05:29:44 +08:00
|
|
|
contains_louter = True
|
|
|
|
self.unref_alias(self.tables[pos])
|
|
|
|
# The path.join_field is a Rel, lets get the other side's field
|
|
|
|
join_field = path.join_field.field
|
|
|
|
# Build the filter prefix.
|
|
|
|
trimmed_prefix = []
|
|
|
|
paths_in_prefix = pos
|
|
|
|
for name, path in names_with_path:
|
|
|
|
if paths_in_prefix - len(path) < 0:
|
2013-03-25 00:40:40 +08:00
|
|
|
break
|
2013-06-06 05:29:44 +08:00
|
|
|
trimmed_prefix.append(name)
|
|
|
|
paths_in_prefix -= len(path)
|
|
|
|
trimmed_prefix.append(
|
|
|
|
join_field.foreign_related_fields[0].name)
|
|
|
|
trimmed_prefix = LOOKUP_SEP.join(trimmed_prefix)
|
|
|
|
# Lets still see if we can trim the first join from the inner query
|
|
|
|
# (that is, self). We can't do this for LEFT JOINs because we would
|
|
|
|
# miss those rows that have nothing on the outer side.
|
|
|
|
if self.alias_map[self.tables[pos + 1]].join_type != self.LOUTER:
|
|
|
|
select_fields = [r[0] for r in join_field.related_fields]
|
|
|
|
select_alias = self.tables[pos + 1]
|
2013-03-25 00:40:40 +08:00
|
|
|
self.unref_alias(self.tables[pos])
|
2013-06-06 05:29:44 +08:00
|
|
|
extra_restriction = join_field.get_extra_restriction(
|
|
|
|
self.where_class, None, self.tables[pos + 1])
|
|
|
|
if extra_restriction:
|
|
|
|
self.where.add(extra_restriction, AND)
|
|
|
|
else:
|
|
|
|
# TODO: It might be possible to trim more joins from the start of the
|
|
|
|
# inner query if it happens to have a longer join chain containing the
|
|
|
|
# values in select_fields. Lets punt this one for now.
|
|
|
|
select_fields = [r[1] for r in join_field.related_fields]
|
|
|
|
select_alias = self.tables[pos]
|
2013-03-25 00:40:40 +08:00
|
|
|
self.select = [SelectInfo((select_alias, f.column), f) for f in select_fields]
|
2013-06-06 05:29:44 +08:00
|
|
|
return trimmed_prefix, contains_louter
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2012-04-30 00:25:46 +08:00
|
|
|
def is_nullable(self, field):
|
|
|
|
"""
|
|
|
|
A helper to check if the given field should be treated as nullable.
|
|
|
|
|
|
|
|
Some backends treat '' as null and Django treats such fields as
|
|
|
|
nullable for those backends. In such situations field.null can be
|
|
|
|
False even if we should treat the field as nullable.
|
|
|
|
"""
|
|
|
|
# We need to use DEFAULT_DB_ALIAS here, as QuerySet does not have
|
|
|
|
# (nor should it have) knowledge of which connection is going to be
|
|
|
|
# used. The proper fix would be to defer all decisions where
|
|
|
|
# is_nullable() is needed to the compiler stage, but that is not easy
|
|
|
|
# to do currently.
|
|
|
|
if ((connections[DEFAULT_DB_ALIAS].features.interprets_empty_strings_as_nulls)
|
|
|
|
and field.empty_strings_allowed):
|
|
|
|
return True
|
|
|
|
else:
|
|
|
|
return field.null
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
|
2013-07-08 08:39:54 +08:00
|
|
|
|
Merged the queryset-refactor branch into trunk.
This is a big internal change, but mostly backwards compatible with existing
code. Also adds a couple of new features.
Fixed #245, #1050, #1656, #1801, #2076, #2091, #2150, #2253, #2306, #2400, #2430, #2482, #2496, #2676, #2737, #2874, #2902, #2939, #3037, #3141, #3288, #3440, #3592, #3739, #4088, #4260, #4289, #4306, #4358, #4464, #4510, #4858, #5012, #5020, #5261, #5295, #5321, #5324, #5325, #5555, #5707, #5796, #5817, #5987, #6018, #6074, #6088, #6154, #6177, #6180, #6203, #6658
git-svn-id: http://code.djangoproject.com/svn/django/trunk@7477 bcc190cf-cafb-0310-a4f2-bffc1f526a37
2008-04-27 10:50:16 +08:00
|
|
|
def get_order_dir(field, default='ASC'):
|
|
|
|
"""
|
|
|
|
Returns the field name and direction for an order specification. For
|
|
|
|
example, '-foo' is returned as ('foo', 'DESC').
|
|
|
|
|
|
|
|
The 'default' param is used to indicate which way no prefix (or a '+'
|
|
|
|
prefix) should sort. The '-' prefix always sorts the opposite way.
|
|
|
|
"""
|
|
|
|
dirn = ORDER_DIR[default]
|
|
|
|
if field[0] == '-':
|
|
|
|
return field[1:], dirn[1]
|
|
|
|
return field, dirn[0]
|
|
|
|
|
|
|
|
|
2009-03-19 17:06:04 +08:00
|
|
|
def add_to_dict(data, key, value):
|
|
|
|
"""
|
|
|
|
A helper function to add "value" to the set of values for "key", whether or
|
|
|
|
not "key" already exists.
|
|
|
|
"""
|
|
|
|
if key in data:
|
|
|
|
data[key].add(value)
|
|
|
|
else:
|
|
|
|
data[key] = set([value])
|
2012-11-29 00:16:00 +08:00
|
|
|
|
2013-07-08 08:39:54 +08:00
|
|
|
|
2012-11-29 00:16:00 +08:00
|
|
|
def is_reverse_o2o(field):
|
|
|
|
"""
|
|
|
|
A little helper to check if the given field is reverse-o2o. The field is
|
|
|
|
expected to be some sort of relation field or related object.
|
|
|
|
"""
|
|
|
|
return not hasattr(field, 'rel') and field.field.unique
|
2012-08-25 19:13:37 +08:00
|
|
|
|
2013-07-08 08:39:54 +08:00
|
|
|
|
2012-08-25 19:13:37 +08:00
|
|
|
def alias_diff(refcounts_before, refcounts_after):
|
|
|
|
"""
|
|
|
|
Given the before and after copies of refcounts works out which aliases
|
|
|
|
have been added to the after copy.
|
|
|
|
"""
|
2013-06-10 23:22:30 +08:00
|
|
|
# Use -1 as default value so that any join that is created, then trimmed
|
|
|
|
# is seen as added.
|
2012-08-25 19:13:37 +08:00
|
|
|
return set(t for t in refcounts_after
|
2013-06-10 23:22:30 +08:00
|
|
|
if refcounts_after[t] > refcounts_before.get(t, -1))
|