summaryrefslogtreecommitdiff
path: root/django/db/models/__init__.py
diff options
context:
space:
mode:
authorNicolas Delaby <ticosax@free.fr>2017-09-22 17:53:17 +0200
committerTim Graham <timograham@gmail.com>2017-09-22 11:53:17 -0400
commit01d440fa1e6b5c62acfa8b3fde43dfa1505f93c6 (patch)
tree21b1f96ecd0fca636746595bce50eb46abdde880 /django/db/models/__init__.py
parent3f9d85d95cab228fd881ea952c707022e9e3bdf3 (diff)
downloaddjango-01d440fa1e6b5c62acfa8b3fde43dfa1505f93c6.tar.gz
Fixed #27332 -- Added FilteredRelation API for conditional join (ON clause) support.
Thanks Anssi Kääriäinen for contributing to the patch.
Diffstat (limited to 'django/db/models/__init__.py')
-rw-r--r--django/db/models/__init__.py2
1 files changed, 2 insertions, 0 deletions
diff --git a/django/db/models/__init__.py b/django/db/models/__init__.py
index d29addd1f7..628f92db3c 100644
--- a/django/db/models/__init__.py
+++ b/django/db/models/__init__.py
@@ -20,6 +20,7 @@ from django.db.models.manager import Manager
from django.db.models.query import (
Prefetch, Q, QuerySet, prefetch_related_objects,
)
+from django.db.models.query_utils import FilteredRelation
# Imports that would create circular imports if sorted
from django.db.models.base import DEFERRED, Model # isort:skip
@@ -69,6 +70,7 @@ __all__ += [
'Window', 'WindowFrame',
'FileField', 'ImageField', 'OrderWrt', 'Lookup', 'Transform', 'Manager',
'Prefetch', 'Q', 'QuerySet', 'prefetch_related_objects', 'DEFERRED', 'Model',
+ 'FilteredRelation',
'ForeignKey', 'ForeignObject', 'OneToOneField', 'ManyToManyField',
'ManyToOneRel', 'ManyToManyRel', 'OneToOneRel', 'permalink',
]