entrouvert
/
debian-django-cachalot
17
0
Fork 0
Code Issues Pull Requests Releases Activity

Fixed django>=1.11 support. 

Since Django 1.11 the ``query`` argument of the SQLCompiler constructor has always a ``subquery`` property, in fact if the SQL query has no real sub query it is set to False.
As a result, the test done by Django-cachalot in the ``_get_tables`` function is no more accurate and cause a dramatic slow down on 1.11 django installs.
This fix should be backwards compatible with older versions of Django.
This commit is contained in:
David Jean Louis 2017-06-02 17:29:11 +02:00
parent a302f6b77a
commit 179d8f2e21
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cachalot/utils.py
View File

@ -162,7 +162,7 @@ def _get_tables(query, db_alias):
subquery_constraints = _find_subqueries(query.where.children)
for subquery in subquery_constraints:
tables.update(_get_tables(subquery, db_alias))
if query.extra_select or hasattr(query, 'subquery') \
if query.extra_select or (hasattr(query, 'subquery') and query.subquery) \
or any(c.__class__ is ExtraWhere for c in query.where.children):
sql = query.get_compiler(db_alias).as_sql()[0].lower()
additional_tables = _get_tables_from_sql(connections[db_alias], sql)