Merge pull request #1188 from rafalp/remove-old-cache-version-model

Remove old cacheversion model

misago/core/migrations/0003_delete_cacheversion.py

@@ -0,0 +1,9 @@
+# Generated by Django 1.11.17 on 2019-01-08 19:49
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [("misago_core", "0002_basic_settings")]
+
+    operations = [migrations.DeleteModel(name="CacheVersion")]

misago/core/models.py

@@ -1,6 +0,0 @@
-from django.db import models
-
-
-class CacheVersion(models.Model):
-    cache = models.CharField(max_length=128)
-    version = models.PositiveIntegerField(default=0)

misago/core/tests/test_chunk_queryset.py

@@ -1,6 +1,6 @@
 from django.test import TestCase
 
-from ..models import CacheVersion
+from ...cache.models import CacheVersion
 from ..pgutils import chunk_queryset
 
 
@@ -9,27 +9,26 @@ class ChunkQuerysetTest(TestCase):
         # clear table
         CacheVersion.objects.all().delete()
 
-        # create 100 items
-        items_ids = []
-        for _ in range(100):
-            obj = CacheVersion.objects.create(cache="nomatter")
-            items_ids.append(obj.id)
-        self.items_ids = list(reversed(items_ids))
+        items_pks = []
+        for i in range(50):
+            obj = CacheVersion.objects.create(cache="test%s" % i)
+            items_pks.append(obj.pk)
+        self.items_pks = list(sorted(items_pks, reverse=True))
 
     def test_chunk_queryset(self):
         """chunk_queryset utility chunks queryset but returns all items"""
-        chunked_ids = []
+        chunked_pks = []
 
-        with self.assertNumQueries(21):
-            queryset = CacheVersion.objects.all()
+        with self.assertNumQueries(11):
+            queryset = CacheVersion.objects.order_by("cache")
             for obj in chunk_queryset(queryset, chunk_size=5):
-                chunked_ids.append(obj.id)
+                chunked_pks.append(obj.pk)
 
-        self.assertEqual(chunked_ids, self.items_ids)
+        self.assertEqual(chunked_pks, self.items_pks)
 
     def test_chunk_shrinking_queryset(self):
         """chunk_queryset utility chunks queryset in delete action"""
-        with self.assertNumQueries(121):
+        with self.assertNumQueries(61):
             queryset = CacheVersion.objects.all()
             for obj in chunk_queryset(queryset, chunk_size=5):
                 obj.delete()