mirrors/django
1
0
Fork 0
mirror of https://github.com/django/django.git synced 2025-10-24 06:06:09 +00:00
Code Issues 32 Releases Wiki Activity

Fixed #20420 -- Normalized query counts on Oracle.

Browse Source 
This is achieved by inserting a fake entry in connection.queries when
not releasing a savepoint (since Oracle doesn't support that operation.)

Also removed the can_release_savepoints feature that was recently added,
but is superseded by this solution.
This commit is contained in:
Aymeric Augustin
2014-06-08 22:42:12 +02:00
parent 127218b92b
commit 40bfd8561d
3 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
tests/admin_views/tests.py
View File

@@ -3960,11 +3960,7 @@ class UserAdminTest(TestCase):
# Don't depend on a warm cache, see #17377.
ContentType.objects.clear_cache()
expected_queries = 10
if not connection.features.can_release_savepoints:
expected_queries -= 1
with self.assertNumQueries(expected_queries):
with self.assertNumQueries(10):
response = self.client.get('/test_admin/admin/auth/user/%s/' % u.pk)
self.assertEqual(response.status_code, 200)
@@ -4001,12 +3997,7 @@ class GroupAdminTest(TestCase):
def test_group_permission_performance(self):
g = Group.objects.create(name="test_group")
expected_queries = 8
if not connection.features.can_release_savepoints:
expected_queries -= 1
with self.assertNumQueries(expected_queries):
with self.assertNumQueries(8):
response = self.client.get('/test_admin/admin/auth/group/%s/' % g.pk)
self.assertEqual(response.status_code, 200)