Changeset 5943

Timestamp:

08/19/07 07:37:00 (1 year ago)

Author:

mtredinnick

Message:

Fixed #5087 -- Fixed support for TextField? filtering with Oracle. Thanks, Ian Kelly.

Files:

• django/trunk/django/db/backends/oracle/base.py (modified) (1 diff)
• django/trunk/django/db/models/query.py (modified) (6 diffs)
• django/trunk/tests/regressiontests/string_lookup/models.py (modified) (2 diffs)

django/trunk/django/db/backends/oracle/base.py

@@ -181 +181 @@
-def get_datetime_cast_sql():
-    return "TO_TIMESTAMP(%s, 'YYYY-MM-DD HH24:MI:SS.FF')"
+
+def get_field_cast_sql(db_type):
+    if db_type.endswith('LOB'):
+        return "DBMS_LOB.SUBSTR(%s%s)"
+    else:
+        return "%s%s"
-
-def get_limit_offset_sql(limit, offset=None):

django/trunk/django/db/models/query.py

@@ -778 +778 @@
-        return joins, where2, params
-
-
+, db_type
-    if table_prefix.endswith('.'):
-        table_prefix = backend.quote_name(table_prefix[:-1])+'.'
@@ -786 +786 @@
-    else:
-        cast_sql = '%s'
+    if db_type and hasattr(backend, 'get_field_cast_sql'):
+        field_cast_sql = backend.get_field_cast_sql(db_type)
+    else:
+        field_cast_sql = '%s%s'
+    field_sql = field_cast_sql % (table_prefix, field_name)
-    if lookup_type in ('iexact', 'icontains', 'istartswith', 'iendswith') and backend.needs_upper_for_iops:
-%s
+
-    else:
-%s
+
-    try:
-table_prefix, field_name
+field_sql
-                         backend.OPERATOR_MAPPING[lookup_type] % cast_sql)
-    except KeyError:
@@ -798 +803 @@
-        in_string = ','.join(['%s' for id in value])
-        if in_string:
-%s IN (%s)' % (table_prefix, field_name
+ IN (%s)' % (field_sql
-        else:
-            raise EmptyResultSet
-    elif lookup_type in ('range', 'year'):
-%s BETWEEN %%s AND %%s' % (table_prefix, field_name)
+ BETWEEN %%s AND %%s' % field_sql
-    elif lookup_type in ('month', 'day'):
-table_prefix + field_name
+field_sql
-    elif lookup_type == 'isnull':
-%s IS %sNULL" % (table_prefix, field_name
+ IS %sNULL" % (field_sql
-    elif lookup_type == 'search':
-table_prefix + field_name
+field_sql
-    elif lookup_type in ('regex', 'iregex'):
-        if settings.DATABASE_ENGINE == 'oracle':
@@ -815 +820 @@
-            else:
-                match_option = 'i'
-%s, %s, '%s')" % (table_prefix, field_name
+, %s, '%s')" % (field_sql
-        else:
-            raise NotImplementedError
@@ -1072 +1077 @@
-        # No elements left in path. Current element is the element on which
-        # the search is being performed.
+        db_type = None
-
-        if join_required:
@@ -1101 +1107 @@
-            # Last query term was a normal field.
-            column = field.column
-
-
+
+
+
-        params.extend(field.get_db_prep_lookup(lookup_type, value))
-

django/trunk/tests/regressiontests/string_lookup/models.py

@@ -36 +36 @@
-    def __unicode__(self):
-        return "Base %s" % self.name
+
+class Article(models.Model):
+    name = models.CharField(maxlength = 50)
+    text = models.TextField()
+
+    def __str__(self):
+        return "Article %s" % self.name
-
-__test__ = {'API_TESTS': ur"""
@@ -83 +90 @@
->>> Foo.objects.get(friend__contains='\xc3\xa7')
-<Foo: Foo Bjorn>
+
+# Regression tests for #5087: make sure we can perform queries on TextFields.
+>>> a = Article(name='Test', text='The quick brown fox jumps over the lazy dog.')
+>>> a.save()
+>>> Article.objects.get(text__exact='The quick brown fox jumps over the lazy dog.')
+<Article: Article Test>
+
+>>> Article.objects.get(text__contains='quick brown fox')
+<Article: Article Test>
-"""}