innov
/
django1
1
0
Fork 0
Code Issues Pull Requests 1 Projects Releases Wiki Activity

Fixed #17335 -- Added supports_select_related hook for django-nonrel. Thanks, jonash 

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17170 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Adrian Holovaty 2011-12-05 23:11:43 +00:00
parent 33bb3cd47c
commit 5f9dbef4bb
2 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django/db/backends/__init__.py
View File

@ -313,6 +313,8 @@ class BaseDatabaseFeatures(object):
has_select_for_update = False has_select_for_update = False
has_select_for_update_nowait = False has_select_for_update_nowait = False
supports_select_related = True
# Does the default test database allow multiple connections? # Does the default test database allow multiple connections?
# Usually an indication that the test database is in-memory # Usually an indication that the test database is in-memory
test_db_allows_multiple_connections = True test_db_allows_multiple_connections = True

4
django/db/models/query.py
View File

@ -232,7 +232,9 @@ class QuerySet(object):
An iterator over the results from applying this QuerySet to the An iterator over the results from applying this QuerySet to the
database. database.
""" """
fill_cache = self.query.select_related fill_cache = False
if connections[self.db].features.supports_select_related:
fill_cache = self.query.select_related
if isinstance(fill_cache, dict): if isinstance(fill_cache, dict):
requested = fill_cache requested = fill_cache
else: else: