Changeset 8215 for django/branches/gis/django/db/backends

Timestamp:

08/05/08 12:15:33 (5 months ago)

Author:

jbronn

Message:

gis: Merged revisions 7981-8001,8003-8011,8013-8033,8035-8036,8038-8039,8041-8063,8065-8076,8078-8139,8141-8154,8156-8214 via svnmerge from trunk.

Files:

• django/branches/gis (modified) (1 prop)
• django/branches/gis/django/db/backends/__init__.py (modified) (5 diffs)
• django/branches/gis/django/db/backends/mysql/base.py (modified) (2 diffs)
• django/branches/gis/django/db/backends/oracle/base.py (modified) (6 diffs)
• django/branches/gis/django/db/backends/oracle/query.py (modified) (4 diffs)
• django/branches/gis/django/db/backends/sqlite3/base.py (modified) (2 diffs)
• django/branches/gis/django/db/backends/util.py (modified) (2 diffs)

django/branches/gis/django/db/backends/__init__.py

@@ -5 +5 @@
-    # Import copy of _thread_local.py from Python 2.4
-    from django.utils._threading_local import local
+
+from django.db.backends import util
+from django.utils import datetime_safe
-
-class BaseDatabaseWrapper(local):
@@ -37 +40 @@
-
-    def make_debug_cursor(self, cursor):
-        from django.db.backends import util
-        return util.CursorDebugWrapper(cursor, self)
-
@@ -43 +45 @@
-    allows_group_by_ordinal = True
-    inline_fk_references = True
+    # True if django.db.backend.utils.typecast_timestamp is used on values
+    # returned from dates() calls.
-    needs_datetime_string_cast = True
-    supports_constraints = True
@@ -50 +54 @@
-    empty_fetchmany_value = []
-    update_can_self_select = True
-    supports_usecs = True
-    time_field_needs_date = False
-    interprets_empty_strings_as_nulls = False
-    date_field_supports_time_value = True
-    can_use_chunked_reads = True
-
@@ -264 +265 @@
-        from django.utils.encoding import smart_unicode
-        return smart_unicode(x).replace("\\", "\\\\").replace("%", "\%").replace("_", "\_")
+
+    def value_to_db_date(self, value):
+        """
+        Transform a date value to an object compatible with what is expected
+        by the backend driver for date columns.
+        """
+        if value is None:
+            return None
+        return datetime_safe.new_date(value).strftime('%Y-%m-%d')
+
+    def value_to_db_datetime(self, value):
+        """
+        Transform a datetime value to an object compatible with what is expected
+        by the backend driver for datetime columns.
+        """
+        if value is None:
+            return None
+        return unicode(value)
+
+    def value_to_db_time(self, value):
+        """
+        Transform a datetime value to an object compatible with what is expected
+        by the backend driver for time columns.
+        """
+        if value is None:
+            return None
+        return unicode(value)
+
+    def value_to_db_decimal(self, value, max_digits, decimal_places):
+        """
+        Transform a decimal.Decimal value to an object compatible with what is
+        expected by the backend driver for decimal (numeric) columns.
+        """
+        if value is None:
+            return None
+        return util.format_number(value, max_digits, decimal_places)
+
+    def year_lookup_bounds(self, value):
+        """
+        Returns a two-elements list with the lower and upper bound to be used
+        with a BETWEEN operator to query a field value using a year lookup
+
+        `value` is an int, containing the looked-up year.
+        """
+        first = '%s-01-01 00:00:00'
+        second = '%s-12-31 23:59:59.999999'
+        return [first % value, second % value]
+
+    def year_lookup_bounds_for_date_field(self, value):
+        """
+        Returns a two-elements list with the lower and upper bound to be used
+        with a BETWEEN operator to query a DateField value using a year lookup
+
+        `value` is an int, containing the looked-up year.
+
+        By default, it just calls `self.year_lookup_bounds`. Some backends need
+        this hook because on their DB date fields can't be compared to values
+        which include a time part.
+        """
+        return self.year_lookup_bounds(value)
+

django/branches/gis/django/db/backends/mysql/base.py

@@ -64 +64 @@
-    empty_fetchmany_value = ()
-    update_can_self_select = False
-    supports_usecs = False
-
-class DatabaseOperations(BaseDatabaseOperations):
@@ -124 +123 @@
-        else:
-            return []
+
+    def value_to_db_datetime(self, value):
+        # MySQL doesn't support microseconds
+        if value is None:
+            return None
+        return unicode(value.replace(microsecond=0))
+
+    def value_to_db_time(self, value):
+        # MySQL doesn't support microseconds
+        if value is None:
+            return None
+        return unicode(value.replace(microsecond=0))
+
+    def year_lookup_bounds(self, value):
+        # Again, no microseconds
+        first = '%s-01-01 00:00:00'
+        second = '%s-12-31 23:59:59.99'
+        return [first % value, second % value]
-
-class DatabaseWrapper(BaseDatabaseWrapper):

django/branches/gis/django/db/backends/oracle/base.py

@@ -6 +6 @@
-
-import os
+import datetime
+import time
-
-from django.db.backends import BaseDatabaseWrapper, BaseDatabaseFeatures, BaseDatabaseOperations, util
-from django.db.backends.oracle import query
-from django.utils.datastructures import SortedDict
-from django.utils.encoding import smart_str, force_unicode
-
@@ -30 +31 @@
-    uses_case_insensitive_names = True
-    uses_custom_query_class = True
-    time_field_needs_date = True
-    interprets_empty_strings_as_nulls = True
-    date_field_supports_time_value = False
-
-class DatabaseOperations(BaseDatabaseOperations):
@@ -181 +180 @@
-    def tablespace_sql(self, tablespace, inline=False):
-        return "%sTABLESPACE %s" % ((inline and "USING INDEX " or ""), self.quote_name(tablespace))
+
+    def value_to_db_time(self, value):
+        if value is None:
+            return None
+        if isinstance(value, basestring):
+            return datetime.datetime(*(time.strptime(value, '%H:%M:%S')[:6]))
+        return datetime.datetime(1900, 1, 1, value.hour, value.minute,
+                                 value.second, value.microsecond)
+
+    def year_lookup_bounds_for_date_field(self, value):
+        first = '%s-01-01'
+        second = '%s-12-31'
+        return [first % value, second % value]
+
+
-
-class DatabaseWrapper(BaseDatabaseWrapper):
@@ -246 +260 @@
-class OracleParam(object):
-    """
- 
- 
+
+
-    the input size needs to be set as NCLOB. Alternatively, if the parameter has
- 
+
-    be used instead. Otherwise, no input size will be set for the parameter when
-    executing the query.
@@ -283 +297 @@
-        else:
-            return tuple([OracleParam(p, self.charset, True) for p in params])
-
+
-    def _guess_input_sizes(self, params_list):
-        if isinstance(params_list[0], dict):
@@ -304 +318 @@
-        else:
-            return [p.smart_str for p in params]
-
+
-    def execute(self, query, params=None):
-        if params is None:

django/branches/gis/django/db/backends/oracle/query.py

@@ -88 +88 @@
-            included in the query.
-            """
+
-            # The `do_offset` flag indicates whether we need to construct
-            # the SQL needed to use limit/offset w/Oracle.
-
+
+
-
-            # If no offsets, just return the result of the base class
@@ -118 +120 @@
-            # extra selection SQL.
-            self.extra_select['rn'] = 'ROW_NUMBER() OVER (ORDER BY %s )' % rn_orderby
-
+ 
-                    with_col_aliases=True)
-
@@ -127 +129 @@
-            # Place WHERE condition on `rn` for the desired range.
-            result.append('WHERE rn > %d' % self.low_mark)
-
+ is not None
-                result.append('AND rn <= %d' % self.high_mark)
-
@@ -149 +151 @@
-    _classes[QueryClass] = OracleQuery
-    return OracleQuery
-

django/branches/gis/django/db/backends/sqlite3/base.py

@@ -85 +85 @@
-        return sql
-
+    def year_lookup_bounds(self, value):
+        first = '%s-01-01'
+        second = '%s-12-31 23:59:59.999999'
+        return [first % value, second % value]
+
+
-class DatabaseWrapper(BaseDatabaseWrapper):
-    features = DatabaseFeatures()
@@ -160 +166 @@
-    except (ValueError, TypeError):
-        return None
-str(getattr(dt, lookup_type)
+getattr(dt, lookup_type
-
-def _sqlite_date_trunc(lookup_type, dt):

django/branches/gis/django/db/backends/util.py

@@ -1 +1 @@
-import datetime
-import md5
-from time import time
+
+from django.utils.hashcompat import md5_constructor
-
-try:
@@ -115 +116 @@
-        return name
-
-.md5
+_constructor
-
-    return '%s%s' % (name[:length-4], hash)
+
+def format_number(value, max_digits, decimal_places):
+    """
+    Formats a number into a string with the requisite number of digits and
+    decimal places.
+    """
+    return u"%.*f" % (decimal_places, value)