Ticket #1261: firebird_backend_patch_6650.diff

django/db/models/fields/__init__.py

@@ -206 +206 @@
-        return value
-
-    def get_db_prep_lookup(self, lookup_type, value):
+        from django.db import connection
-        "Returns field's value prepared for database lookup."
-        if lookup_type in ('exact', 'regex', 'iregex', 'gt', 'gte', 'lt', 'lte', 'month', 'day', 'search'):
-            return [value]
-        elif lookup_type in ('range', 'in'):
-            return value
-        elif lookup_type in ('contains', 'icontains'):
+            if connection.features.uses_custom_icontains and lookup_type == 'icontains':
+                return [value]    
-            return ["%%%s%%" % prep_for_like_query(value)]
-        elif lookup_type == 'iexact':
-            return [prep_for_like_query(value)]
-        elif lookup_type in ('startswith', 'istartswith'):
+            if connection.features.uses_custom_startswith:
+                return [value]
-            return ["%s%%" % prep_for_like_query(value)]
-        elif lookup_type in ('endswith', 'iendswith'):
-            return ["%%%s" % prep_for_like_query(value)]
@@ -478 +483 @@
-        defaults.update(kwargs)
-        return super(CharField, self).formfield(**defaults)
-
+class ASCIICharField(CharField):
+    pass
+
-# TODO: Maybe move this into contrib, because it's specialized.
-class CommaSeparatedIntegerField(CharField):
-    def get_manipulator_field_objs(self):
@@ -587 +595 @@
-            # doesn't support microseconds.
-            if settings.DATABASE_ENGINE == 'mysql' and hasattr(value, 'microsecond'):
-                value = value.replace(microsecond=0)
-
+
+
+
-        return Field.get_db_prep_save(self, value)
-
-    def get_db_prep_lookup(self, lookup_type, value):
@@ -995 +1005 @@
-            # doesn't support microseconds.
-            if settings.DATABASE_ENGINE == 'mysql' and hasattr(value, 'microsecond'):
-                value = value.replace(microsecond=0)
-== 'oracle'
-expects
+in ('oracle', 'firebird')
+and kinterbasdb expect
-                if isinstance(value, datetime.time):
-                    value = datetime.datetime(1900, 1, 1, value.hour, value.minute,
-                                              value.second, value.microsecond)

django/db/backends/__init__.py

@@ -45 +45 @@
-    autoindexes_primary_keys = True
-    inline_fk_references = True
-    needs_datetime_string_cast = True
+    needs_default_null = False
-    needs_upper_for_iops = False
-    supports_constraints = True
-    supports_tablespaces = False
-    uses_case_insensitive_names = False
+    uses_custom_icontains = False
+    uses_custom_startswith = False
-    uses_custom_queryset = False
-
-class BaseDatabaseOperations(object):
@@ -65 +68 @@
-        This SQL is executed when a table is created.
-        """
-        return None
-
+
+
+
+
+
+
+
+
-    def date_extract_sql(self, lookup_type, field_name):
-        """
-        Given a lookup_type of 'year', 'month' or 'day', returns the SQL that

django/core/management/sql.py

@@ -263 +263 @@
-        # Make the definition (e.g. 'foo VARCHAR(30)') for this field.
-        field_output = [style.SQL_FIELD(qn(f.column)),
-            style.SQL_COLTYPE(col_type)]
-
+
+
+
+
-        if f.unique and (not f.primary_key or connection.features.allows_unique_and_pk):
-            field_output.append(style.SQL_KEYWORD('UNIQUE'))
-        if f.primary_key:
@@ -276 +279 @@
-            if inline_references and f.rel.to in known_models:
-                field_output.append(style.SQL_KEYWORD('REFERENCES') + ' ' + \
-                    style.SQL_TABLE(qn(f.rel.to._meta.db_table)) + ' (' + \
-
-
+ \
+cascade_delete_update_sql() + connection.ops.
-                )
-            else:
-                # We haven't yet created the table to which this field
@@ -335 +338 @@
-                final_output.append(style.SQL_KEYWORD('ALTER TABLE') + ' %s ADD CONSTRAINT %s FOREIGN KEY (%s) REFERENCES %s (%s)%s;' % \
-                    (qn(r_table), truncate_name(r_name, connection.ops.max_name_length()),
-                    qn(r_col), qn(table), qn(col),
+                    connection.ops.cascade_delete_update_sql(),
-                    connection.ops.deferrable_sql()))
-            del pending_references[model]
-    return final_output
@@ -364 +368 @@
-                tablespace_sql))
-            if inline_references:
-                deferred = []
-
+%s
-                    (style.SQL_FIELD(qn(f.m2m_column_name())),
-                    style.SQL_COLTYPE(models.ForeignKey(model).db_type()),
-                    style.SQL_KEYWORD('NOT NULL REFERENCES'),
-                    style.SQL_TABLE(qn(opts.db_table)),
-                    style.SQL_FIELD(qn(opts.pk.column)),
+                    connection.ops.cascade_delete_update_sql(),
-                    connection.ops.deferrable_sql()))
-
+%s
-                    (style.SQL_FIELD(qn(f.m2m_reverse_name())),
-                    style.SQL_COLTYPE(models.ForeignKey(f.rel.to).db_type()),
-                    style.SQL_KEYWORD('NOT NULL REFERENCES'),
-                    style.SQL_TABLE(qn(f.rel.to._meta.db_table)),
-                    style.SQL_FIELD(qn(f.rel.to._meta.pk.column)),
+                    connection.ops.cascade_delete_update_sql(),
-                    connection.ops.deferrable_sql()))
-            else:
-                table_output.append('    %s %s %s,' %
@@ -412 +418 @@
-                (qn(r_table),
-                truncate_name(r_name, connection.ops.max_name_length()),
-                qn(r_col), qn(table), qn(col),
+                connection.ops.cascade_delete_update_sql(),
-                connection.ops.deferrable_sql()))
-
-            # Add any extra SQL needed to support auto-incrementing PKs

django/contrib/contenttypes/models.py

@@ -1 +1 @@
-from django.db import models
-from django.utils.translation import ugettext_lazy as _
-from django.utils.encoding import smart_unicode
+from django.conf import settings
-
-CONTENT_TYPE_CACHE = {}
-class ContentTypeManager(models.Manager):
@@ -31 +32 @@
-        global CONTENT_TYPE_CACHE
-        CONTENT_TYPE_CACHE = {}
-
-
+   
-    name = models.CharField(max_length=100)
-
-
+
+
+
+
+
+
+
-    objects = ContentTypeManager()
-    class Meta:
-        verbose_name = _('content type')

django/contrib/auth/models.py

@@ -6 +6 @@
-from django.contrib.contenttypes.models import ContentType
-from django.utils.encoding import smart_str
-from django.utils.translation import ugettext_lazy as _
+from django.conf import settings
-import datetime
-import urllib
-
@@ -72 +73 @@
-    """
-    name = models.CharField(_('name'), max_length=50)
-    content_type = models.ForeignKey(ContentType)
-
+
+
+
+
+
-
-    class Meta:
-        verbose_name = _('permission')