Changeset 8242

Timestamp:

08/08/08 15:09:53 (4 months ago)

Author:

mtredinnick

Message:

Fixed #6523 -- Use the correct cast on field types for PostgreSQL when
searching within a field column (e.g. "like", "contains", etc). Required for
PostgreSQL 8.3. Thanks to Dan Watson for the patch.

Files:

• django/trunk/django/db/backends/postgresql/operations.py (modified) (1 diff)
• django/trunk/tests/modeltests/lookup/models.py (modified) (1 diff)

django/trunk/django/db/backends/postgresql/operations.py

@@ -35 +35 @@
-    def deferrable_sql(self):
-        return " DEFERRABLE INITIALLY DEFERRED"
+
+    def lookup_cast(self, lookup_type):
+        if lookup_type in ('iexact', 'contains', 'icontains', 'startswith', 'istartswith',
+                             'endswith', 'iendswith'):
+            return "%s::text"
+        return "%s"
-
-    def field_cast_sql(self, db_type):

django/trunk/tests/modeltests/lookup/models.py

@@ -34 +34 @@
->>> a7 = Article(headline='Article 7', pub_date=datetime(2005, 7, 27))
->>> a7.save()
+
+# text matching tests for PostgreSQL 8.3
+>>> Article.objects.filter(id__iexact='1')
+[<Article: Article 1>]
+>>> Article.objects.filter(pub_date__startswith='2005')
+[<Article: Article 5>, <Article: Article 6>, <Article: Article 4>, <Article: Article 2>, <Article: Article 3>, <Article: Article 7>, <Article: Article 1>]
-
-# Each QuerySet gets iterator(), which is a generator that "lazily" returns