diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-27 02:50:16 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2008-04-27 02:50:16 +0000 |
| commit | 9c52d56f6f8a9cdafb231adf9f4110473099c9b5 (patch) | |
| tree | eeded174bec983e4415f5f52f187b3d5d9a1882d /django/db/models/sql/__init__.py | |
| parent | c91a30f00fd182faf8ca5c03cd7dbcf8b735b458 (diff) | |
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
Diffstat (limited to 'django/db/models/sql/__init__.py')
| -rw-r--r-- | django/db/models/sql/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/django/db/models/sql/__init__.py b/django/db/models/sql/__init__.py new file mode 100644 index 0000000000..7310982690 --- /dev/null +++ b/django/db/models/sql/__init__.py @@ -0,0 +1,7 @@ +from query import * +from subqueries import * +from where import AND, OR +from datastructures import EmptyResultSet + +__all__ = ['Query', 'AND', 'OR', 'EmptyResultSet'] + |