Skip to content

Commit 995f88e

Browse files
committed
Patch from oliland/django-tagging-ng: django 1.2 compatible
1 parent a3e78e4 commit 995f88e

File tree

1 file changed

+12
-3
lines changed

1 file changed

+12
-3
lines changed

tagging/models.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -173,8 +173,18 @@ def usage_for_queryset(self, queryset, counts=False, min_count=None):
173173
Passing a value for ``min_count`` implies ``counts=True``.
174174
"""
175175

176-
extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])
177-
where, params = queryset.query.where.as_sql()
176+
if getattr(queryset.query, 'get_compiler', None):
177+
# Django 1.2+
178+
compiler = queryset.query.get_compiler(using='default')
179+
extra_joins = ' '.join(compiler.get_from_clause()[0][1:])
180+
where, params = queryset.query.where.as_sql(
181+
compiler.quote_name_unless_alias, compiler.connection
182+
)
183+
else:
184+
# Django pre-1.2
185+
extra_joins = ' '.join(queryset.query.get_from_clause()[0][1:])
186+
where, params = queryset.query.where.as_sql()
187+
178188
if where:
179189
extra_criteria = 'AND %s' % where
180190
else:
@@ -652,4 +662,3 @@ class Meta:
652662
verbose_name = _("Tag's synonym")
653663
verbose_name_plural = _("Tags' synonyms")
654664
ordering = ('name',)
655-

0 commit comments

Comments
 (0)