Skip to content

Commit 0c64d3a

Browse files
committed
Updated TagManager.usage_for_queryset to work with Django 1.7.x
1 parent 80d5927 commit 0c64d3a

File tree

1 file changed

+7
-4
lines changed

1 file changed

+7
-4
lines changed

tagging/models.py

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -159,12 +159,15 @@ def usage_for_queryset(self, queryset, counts=False, min_count=None):
159159
"""
160160

161161
if getattr(queryset.query, 'get_compiler', None):
162-
# Django 1.2+
163162
compiler = queryset.query.get_compiler(using='default')
163+
if getattr(compiler, 'compile', None):
164+
# Django 1.7+
165+
where, params = compiler.compile(queryset.query.where)
166+
else:
167+
# Django 1.2+
168+
where, params = queryset.query.where.as_sql(
169+
compiler.quote_name_unless_alias, compiler.connection)
164170
extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
165-
where, params = queryset.query.where.as_sql(
166-
compiler.quote_name_unless_alias, compiler.connection
167-
)
168171
else:
169172
# Django pre-1.2
170173
extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])

0 commit comments

Comments
 (0)