1
0
mirror of https://github.com/django/django.git synced 2025-10-31 09:41:08 +00:00

Replaced @no_oracle skips with DatabaseFeatures.allows_group_by_lob.

This commit is contained in:
Tim Graham
2020-09-07 15:45:56 -04:00
committed by Mariusz Felisiak
parent ad11f5b8c9
commit 755dbf39fc
6 changed files with 22 additions and 23 deletions

View File

@@ -5,7 +5,6 @@ from django.contrib.gis.shortcuts import render_to_kmz
from django.db.models import Count, Min
from django.test import TestCase, skipUnlessDBFeature
from ..utils import no_oracle
from .models import City, PennsylvaniaCity, State, Truth
@@ -65,10 +64,7 @@ class GeoRegressionTests(TestCase):
# .count() should not throw TypeError in __eq__
self.assertEqual(cities_within_state.count(), 1)
# TODO: fix on Oracle -- get the following error because the SQL is ordered
# by a geometry object, which Oracle apparently doesn't like:
# ORA-22901: cannot compare nested table or VARRAY or LOB attributes of an object type
@no_oracle
@skipUnlessDBFeature('allows_group_by_lob')
def test_defer_or_only_with_annotate(self):
"Regression for #16409. Make sure defer() and only() work with annotate()"
self.assertIsInstance(list(City.objects.annotate(Count('point')).defer('name')), list)