Changeset 5580 for django/branches/unicode/django/db/models

Timestamp:

07/01/07 00:55:01 (1 year ago)

Author:

mtredinnick

Message:

unicode: Merged changes from trunk up to [5579].

Files:

• django/branches/unicode (modified) (1 prop)
• django/branches/unicode/django/db/models/fields/__init__.py (modified) (2 diffs)
• django/branches/unicode/django/db/models/query.py (modified) (3 diffs)

django/branches/unicode/django/db/models/fields/__init__.py

@@ -176 +176 @@
-    def get_db_prep_lookup(self, lookup_type, value):
-        "Returns field's value prepared for database lookup."
-
+regex', 'iregex', '
-            return [value]
-        elif lookup_type in ('range', 'in'):
@@ -802 +802 @@
-
-class IPAddressField(Field):
+    empty_strings_allowed = False
-    def __init__(self, *args, **kwargs):
-        kwargs['maxlength'] = 15

django/branches/unicode/django/db/models/query.py

@@ +1 @@
+from django.conf import settings
-from django.db import backend, connection, transaction
-from django.db.models.fields import DateField, FieldDoesNotExist
@@ -24 +25 @@
-    'startswith', 'istartswith', 'endswith', 'iendswith',
-    'range', 'year', 'month', 'day', 'isnull', 'search',
+    'regex', 'iregex',
-)
-
@@ -799 +801 @@
-    elif lookup_type == 'search':
-        return backend.get_fulltext_search_sql(table_prefix + field_name)
+    elif lookup_type in ('regex', 'iregex'):
+        if settings.DATABASE_ENGINE == 'oracle':
+            if lookup_type == 'regex':
+                match_option = 'c'
+            else:
+                match_option = 'i'
+            return "REGEXP_LIKE(%s%s, %s, '%s')" % (table_prefix, field_name, cast_sql, match_option)
+        else:
+            raise NotImplementedError
-    raise TypeError, "Got invalid lookup_type: %s" % repr(lookup_type)
-