Skip to content

Commit 290aabc

Browse files
hanseguckerauvipy
andauthored
Revert "feat: raw delete expired instead of Queryset.delete (#235)" (#384)
* Revert "feat: raw delete expired instead of `Queryset.delete` (#235)" This partially reverts commit 7c7cb67. * Fix tests for Django 4.2 --------- Co-authored-by: Asif Saif Uddin <auvipy@gmail.com>
1 parent 26e85c1 commit 290aabc

File tree

4 files changed

+3
-48
lines changed

4 files changed

+3
-48
lines changed

django_celery_results/managers.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@
88
from django.conf import settings
99
from django.db import connections, models, router, transaction
1010

11-
from .utils import now, raw_delete
11+
from .utils import now
1212

1313
W_ISOLATION_REP = """
1414
Polling results with transaction isolation level 'repeatable-read'
@@ -87,7 +87,7 @@ def get_all_expired(self, expires):
8787
def delete_expired(self, expires):
8888
"""Delete all expired results."""
8989
with transaction.atomic(using=self.db):
90-
raw_delete(queryset=self.get_all_expired(expires))
90+
self.get_all_expired(expires).delete()
9191

9292

9393
class TaskResultManager(ResultManager):

django_celery_results/utils.py

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,3 @@ def now():
1515
return now_localtime(timezone.now())
1616
else:
1717
return timezone.now()
18-
19-
20-
def raw_delete(queryset):
21-
"""Raw delete given queryset."""
22-
return queryset._raw_delete(queryset.db)

t/unit/test_utils.py

Lines changed: 0 additions & 41 deletions
This file was deleted.

tox.ini

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ deps=
2929
django41: -r{toxinidir}/requirements/test-django41.txt
3030
django40: -r{toxinidir}/requirements/test-django40.txt
3131
django32: -r{toxinidir}/requirements/test-django32.txt
32+
django42: -r{toxinidir}/requirements/test-django42.txt
3233

3334
cov,integration: -r{toxinidir}/requirements/test-django.txt
3435

0 commit comments

Comments
 (0)