summaryrefslogtreecommitdiff
path: root/tests
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2013-06-11 17:54:56 -0400
committerTim Graham <timograham@gmail.com>2013-06-11 17:55:19 -0400
commit92c49d6f01700961698eb3d79fd393d673cee219 (patch)
treeff93830ca4010efc6a4b370136ab01641cff7720 /tests
parent78974ed525a9aa6e6b78c59f3e84df3fdbfc6fa6 (diff)
Revert "Fixed #20462 - Fixed sqlite regex lookups for null values and non-string fields."
This reverts commit 64041f0e6e7a773574d7cde978d16305200004ea. lookup.tests.LookupTests.test_regex_non_string fails under Postgres. We should also try to rewrite the test using an existing model.
Diffstat (limited to 'tests')
-rw-r--r--tests/lookup/models.py9
-rw-r--r--tests/lookup/tests.py17
2 files changed, 1 insertions, 25 deletions
diff --git a/tests/lookup/models.py b/tests/lookup/models.py
index af236cf56f..f388ddf403 100644
--- a/tests/lookup/models.py
+++ b/tests/lookup/models.py
@@ -57,12 +57,3 @@ class Player(models.Model):
def __str__(self):
return self.name
-
-
-@python_2_unicode_compatible
-class RegexTestModel(models.Model):
- name = models.CharField(max_length=100, null=True)
- integer = models.IntegerField(null=True)
-
- def __str__(self):
- return self.name
diff --git a/tests/lookup/tests.py b/tests/lookup/tests.py
index 5affac6b00..de7105f92d 100644
--- a/tests/lookup/tests.py
+++ b/tests/lookup/tests.py
@@ -6,7 +6,7 @@ from operator import attrgetter
from django.core.exceptions import FieldError
from django.test import TestCase, skipUnlessDBFeature
-from .models import Author, Article, Tag, Game, Season, Player, RegexTestModel
+from .models import Author, Article, Tag, Game, Season, Player
class LookupTests(TestCase):
@@ -610,21 +610,6 @@ class LookupTests(TestCase):
self.assertQuerysetEqual(Article.objects.filter(headline__regex=r'b(.).*b\1'),
['<Article: barfoobaz>', '<Article: bazbaRFOO>', '<Article: foobarbaz>'])
- def test_regex_null(self):
- """
- Ensure that a regex lookup does not fail on null/None values
- """
- RegexTestModel.objects.create(name=None)
- self.assertQuerysetEqual(RegexTestModel.objects.filter(name__regex=r'^$'), [])
-
- def test_regex_non_string(self):
- """
- Ensure that a regex lookup does not fail on non-string fields
- """
- RegexTestModel.objects.create(name='test', integer=5)
- self.assertQuerysetEqual(RegexTestModel.objects.filter(integer__regex=r'^5$'),
- ['<RegexTestModel: test>'])
-
def test_nonfield_lookups(self):
"""
Ensure that a lookup query containing non-fields raises the proper