2011-10-18 08:47:49 +08:00
|
|
|
from __future__ import absolute_import
|
|
|
|
|
|
2011-10-18 00:56:18 +08:00
|
|
|
from django.db.models.sql.datastructures import EmptyResultSet
|
2011-10-18 08:47:49 +08:00
|
|
|
from django.db.models.sql.subqueries import *
|
|
|
|
|
from django.db.models.sql.query import *
|
2011-10-18 00:56:18 +08:00
|
|
|
from django.db.models.sql.where import AND, OR
|
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
|
|
|
|
|
|
|
|
|
2011-10-18 08:47:49 +08:00
|
|
|
__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet']
|
