This project is archived. Its data is read-only.

Commit 54026f1e authored May 02, 2015 by Aymeric Augustin

Renamed value_to_db_xxx to adapt_xxxfield_value.

This mirrors convert_xxxfield_value nicely, taking advantage of the
adapter/converter terminology which is commonly used by DB-API modules.

parent d9521f66

django/core/cache/backends/db.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -136,7 +136,7 @@ class DatabaseCache(BaseDatabaseCache):
		current_expires = typecast_timestamp(str(current_expires))
		if settings.USE_TZ:
		current_expires = current_expires.replace(tzinfo=timezone.utc)
		exp = connections[db].ops.value_to_db_datetime(exp)
		exp = connections[db].ops.adapt_datetimefield_value(exp)
		if result and (mode == 'set' or (mode == 'add' and current_expires < now)):
		cursor.execute("UPDATE %s SET value = %%s, expires = %%s "
		"WHERE cache_key = %%s" % table,
		@@ -177,7 +177,7 @@ class DatabaseCache(BaseDatabaseCache):
		with connections[db].cursor() as cursor:
		cursor.execute("SELECT cache_key FROM %s "
		"WHERE cache_key = %%s and expires > %%s" % table,
		[key, connections[db].ops.value_to_db_datetime(now)])
		[key, connections[db].ops.adapt_datetimefield_value(now)])
		return cursor.fetchone() is not None

		def _cull(self, db, cursor, now):
		@@ -188,7 +188,7 @@ class DatabaseCache(BaseDatabaseCache):
		now = now.replace(tzinfo=None)
		table = connections[db].ops.quote_name(self._table)
		cursor.execute("DELETE FROM %s WHERE expires < %%s" % table,
		[connections[db].ops.value_to_db_datetime(now)])
		[connections[db].ops.adapt_datetimefield_value(now)])
		cursor.execute("SELECT COUNT(*) FROM %s" % table)
		num = cursor.fetchone()[0]
		if num > self._max_entries:

django/db/backends/base/operations.py

+14 −14

Original line number	Diff line number	Diff line
		@@ -433,7 +433,7 @@ class BaseDatabaseOperations(object):
		"""
		return value

		def value_to_db_unknown(self, value):
		def adapt_unknown_value(self, value):
		"""
		Transforms a value to something compatible with the backend driver.

		@@ -442,17 +442,17 @@ class BaseDatabaseOperations(object):
		As a consequence it may not work perfectly in all circumstances.
		"""
		if isinstance(value, datetime.datetime): # must be before date
		return self.value_to_db_datetime(value)
		return self.adapt_datetimefield_value(value)
		elif isinstance(value, datetime.date):
		return self.value_to_db_date(value)
		return self.adapt_datefield_value(value)
		elif isinstance(value, datetime.time):
		return self.value_to_db_time(value)
		return self.adapt_timefield_value(value)
		elif isinstance(value, decimal.Decimal):
		return self.value_to_db_decimal(value)
		return self.adapt_decimalfield_value(value)
		else:
		return value

		def value_to_db_date(self, value):
		def adapt_datefield_value(self, value):
		"""
		Transforms a date value to an object compatible with what is expected
		by the backend driver for date columns.
		@@ -461,7 +461,7 @@ class BaseDatabaseOperations(object):
		return None
		return six.text_type(value)

		def value_to_db_datetime(self, value):
		def adapt_datetimefield_value(self, value):
		"""
		Transforms a datetime value to an object compatible with what is expected
		by the backend driver for datetime columns.
		@@ -470,7 +470,7 @@ class BaseDatabaseOperations(object):
		return None
		return six.text_type(value)

		def value_to_db_time(self, value):
		def adapt_timefield_value(self, value):
		"""
		Transforms a time value to an object compatible with what is expected
		by the backend driver for time columns.
		@@ -481,14 +481,14 @@ class BaseDatabaseOperations(object):
		raise ValueError("Django does not support timezone-aware times.")
		return six.text_type(value)

		def value_to_db_decimal(self, value, max_digits, decimal_places):
		def adapt_decimalfield_value(self, value, max_digits, decimal_places):
		"""
		Transforms a decimal.Decimal value to an object compatible with what is
		expected by the backend driver for decimal (numeric) columns.
		"""
		return utils.format_number(value, max_digits, decimal_places)

		def value_to_db_ipaddress(self, value):
		def adapt_ipaddressfield_value(self, value):
		"""
		Transforms a string representation of an IP address into the expected
		type for the backend driver.
		@@ -505,8 +505,8 @@ class BaseDatabaseOperations(object):
		"""
		first = datetime.date(value, 1, 1)
		second = datetime.date(value, 12, 31)
		first = self.value_to_db_date(first)
		second = self.value_to_db_date(second)
		first = self.adapt_datefield_value(first)
		second = self.adapt_datefield_value(second)
		return [first, second]

		def year_lookup_bounds_for_datetime_field(self, value):
		@@ -523,8 +523,8 @@ class BaseDatabaseOperations(object):
		tz = timezone.get_current_timezone()
		first = timezone.make_aware(first, tz)
		second = timezone.make_aware(second, tz)
		first = self.value_to_db_datetime(first)
		second = self.value_to_db_datetime(second)
		first = self.adapt_datetimefield_value(first)
		second = self.adapt_datetimefield_value(second)
		return [first, second]

		def get_db_converters(self, expression):

django/db/backends/mysql/operations.py

+2 −2

Original line number	Diff line number	Diff line
		@@ -138,7 +138,7 @@ class DatabaseOperations(BaseDatabaseOperations):
		'value for AutoField.')
		return value

		def value_to_db_datetime(self, value):
		def adapt_datetimefield_value(self, value):
		if value is None:
		return None

		@@ -154,7 +154,7 @@ class DatabaseOperations(BaseDatabaseOperations):

		return six.text_type(value)

		def value_to_db_time(self, value):
		def adapt_timefield_value(self, value):
		if value is None:
		return None

django/db/backends/oracle/operations.py

+3 −3

Original line number	Diff line number	Diff line
		@@ -374,7 +374,7 @@ WHEN (new.%(col_name)s IS NULL)
		else:
		return "TABLESPACE %s" % self.quote_name(tablespace)

		def value_to_db_date(self, value):
		def adapt_datefield_value(self, value):
		"""
		Transform a date value to an object compatible with what is expected
		by the backend driver for date columns.
		@@ -383,7 +383,7 @@ WHEN (new.%(col_name)s IS NULL)
		"""
		return value

		def value_to_db_datetime(self, value):
		def adapt_datetimefield_value(self, value):
		"""
		Transform a datetime value to an object compatible with what is expected
		by the backend driver for datetime columns.
		@@ -405,7 +405,7 @@ WHEN (new.%(col_name)s IS NULL)

		return Oracle_datetime.from_datetime(value)

		def value_to_db_time(self, value):
		def adapt_timefield_value(self, value):
		if value is None:
		return None

django/db/backends/postgresql_psycopg2/operations.py

+4 −4

Original line number	Diff line number	Diff line
		@@ -225,16 +225,16 @@ class DatabaseOperations(BaseDatabaseOperations):
		items_sql = "(%s)" % ", ".join(["%s"] * len(fields))
		return "VALUES " + ", ".join([items_sql] * num_values)

		def value_to_db_date(self, value):
		def adapt_datefield_value(self, value):
		return value

		def value_to_db_datetime(self, value):
		def adapt_datetimefield_value(self, value):
		return value

		def value_to_db_time(self, value):
		def adapt_timefield_value(self, value):
		return value

		def value_to_db_ipaddress(self, value):
		def adapt_ipaddressfield_value(self, value):
		if value:
		return Inet(value)
		return None