X-Git-Url: https://git.mdrn.pl/wolnelektury.git/blobdiff_plain/ad52d2dda38fe645613acdd2c3b9de006cb58cf9..b9e0f4715ebf40bc7cf297984df2a1489902a2ac:/apps/newtagging/models.py

diff --git a/apps/newtagging/models.py b/apps/newtagging/models.py
index 5385e9506..d3a386b29 100644
--- a/apps/newtagging/models.py
+++ b/apps/newtagging/models.py
@@ -62,6 +62,14 @@ class TagManager(models.Manager):
             if tag not in current_tags:
                 self.intermediary_table_model._default_manager.create(tag=tag, content_object=obj)
     
+    def remove_tag(self, obj, tag):
+        """
+        Remove tag from an object.
+        """
+        content_type = ContentType.objects.get_for_model(obj)
+        self.intermediary_table_model._default_manager.filter(content_type__pk=content_type.pk,
+            object_id=obj.pk, tag=tag).delete()
+
     def get_for_object(self, obj):
         """
         Create a queryset matching all tags associated with the given
@@ -217,22 +225,27 @@ class TagManager(models.Manager):
         if 'where' in extra:
             extra_where = 'AND ' + ' AND '.join(extra['where'])
         
+        # Temporary table in this query is a hack to prevent MySQL from executing
+        # inner query as dependant query (which could result in severe performance loss)
         query = """
         SELECT %(tag_columns)s%(count_sql)s
         FROM %(tagged_item)s INNER JOIN %(tag)s ON %(tagged_item)s.tag_id = %(tag)s.id
         WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
-          AND %(tagged_item)s.object_id IN
-          (
-              SELECT %(tagged_item)s.object_id
-              FROM %(tagged_item)s, %(tag)s
-              WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
-                AND %(tag)s.id = %(tagged_item)s.tag_id
-                AND %(tag)s.id IN (%(tag_id_placeholders)s)
-              GROUP BY %(tagged_item)s.object_id
-              HAVING COUNT(%(tagged_item)s.object_id) = %(tag_count)s
-          )
-          AND %(tag)s.id NOT IN (%(tag_id_placeholders)s)
-          %(extra_where)s
+        AND %(tagged_item)s.object_id IN
+        (
+            SELECT *
+            FROM (
+                SELECT %(tagged_item)s.object_id
+                FROM %(tagged_item)s, %(tag)s
+                WHERE %(tagged_item)s.content_type_id = %(content_type_id)s
+                  AND %(tag)s.id = %(tagged_item)s.tag_id
+                  AND %(tag)s.id IN (%(tag_id_placeholders)s)
+                GROUP BY %(tagged_item)s.object_id
+                HAVING COUNT(%(tagged_item)s.object_id) = %(tag_count)s
+            ) AS temporary
+        )
+        AND %(tag)s.id NOT IN (%(tag_id_placeholders)s)
+        %(extra_where)s
         GROUP BY %(tag_columns)s
         %(min_count_sql)s
         ORDER BY %(tag)s.%(ordering)s ASC""" % {