encode/django-rest-framework
1
1
Fork 0
mirror of https://github.com/encode/django-rest-framework.git synced 2025-08-04 20:40:14 +03:00
Code Issues Packages Projects Releases Wiki Activity

#1338 found the issue, its the filter construction. Dates should not be iexacted but a simple equals query.

Browse Source
This commit is contained in:
Shawn Campbell 2014-09-05 17:50:22 -04:00
parent 79d44435e0
commit bd225c49ce
2 changed files with 17 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
.gitignore vendored
View File

@ -16,5 +16,8 @@ include/
lib/ lib/
local/ local/
*.iml
atlassian-ide-plugin.xml
!.gitignore !.gitignore
!.travis.yml !.travis.yml

19
tests/test_filters.py
View File

@ -723,11 +723,13 @@ class Iso8601DateFilter(TestCase):
def test_filter_isoformat_datetime_against_date_fails(self): def test_filter_isoformat_datetime_against_date_fails(self):
view = FilterFieldsRootView.as_view() view = FilterFieldsRootView.as_view()
# Tests that the date filter fails with an ISO8601 datetime format. # Tests that the date filter fails with an ISO8601 datetime format.
search_date = datetime.datetime(2012, 9, 22, 12, 00, 00) search_date = datetime.datetime(2012, 8, 12, 12, 00, 00)
request = factory.get('/', {'date': '%s' % search_date.isoformat()}) # search_date str: '2012-09-22T12:00:00' request = factory.get('/', {'date': '%s' % search_date.isoformat()}) # search_date str: '2012-09-22T12:00:00'
response = view(request).render() response = view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
expected_data = [f for f in self.data if f['date'] == search_date] expected_data = [f for f in self.data if f['date'] == search_date]
# This should be [] because date != datetime
self.assertEqual(response.data, [])
self.assertEqual(response.data, expected_data) self.assertEqual(response.data, expected_data)
@ -737,7 +739,7 @@ class Iso8601DateTimeFilter(TestCase):
""" """
def _serialize_object(self, obj): def _serialize_object(self, obj):
return {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date} return {'id': obj.id, 'text': obj.text, 'decimal': obj.decimal, 'date': obj.date.isoformat()}
def setUp(self): def setUp(self):
""" """
@ -759,9 +761,16 @@ class Iso8601DateTimeFilter(TestCase):
def test_filter_isoformat_datetime(self): def test_filter_isoformat_datetime(self):
view = FilterFieldsRootView.as_view() view = FilterFieldsRootView.as_view()
# Tests that the date filter works with ISO8601 format. # Tests that the date filter works with ISO8601 format.
search_date = datetime.datetime(2012, 9, 22, 12, 00, 00) search_date = datetime.datetime(2012, 10, 8, 12, 00, 00)
request = factory.get('/', {'date': '%s' % search_date.isoformat()}) # search_date str: '2012-09-22' request = factory.get('/', {'date': '%s' % search_date.isoformat()}) # search_date str: '2012-09-22'
response = view(request).render() response = view(request).render()
self.assertEqual(response.status_code, status.HTTP_200_OK) self.assertEqual(response.status_code, status.HTTP_200_OK)
expected_data = [f for f in self.data if f['date'] == search_date] expected_data = [f for f in self.data if f['date'] == search_date.isoformat()]
self.assertEqual(response.data, expected_data) # This shows that the you cannot filter via an isoformatted datetime
self.assertNotEqual(response.data, expected_data)
# This shows that the issues is not Django filters itself but how the filters are built via iexact
should_find_something = FilterableISO8601Item.objects.filter(date__iexact=search_date.isoformat())
should_find_something_2 = FilterableISO8601Item.objects.filter(date=search_date.isoformat())
self.assertEqual(should_find_something.count(), 0)
# The issue is that dates are being filtered via an iexact filter which does date comparision
self.assertNotEqual(should_find_something.query.__str__(), should_find_something_2.query.__str__())