Moved DatabaseCreation.data_types properties to DatabaseWrapper. (93d73dac) · Commits · Dom Sekotill / django

django/db/backends/init.py

+6 −0

Original line number	Diff line number	Diff line
		@@ -39,6 +39,12 @@ class BaseDatabaseWrapper(object):
		"""
		Represents a database connection.
		"""
		# Mapping of Field objects to their column types.
		data_types = {}
		# Mapping of Field objects to their SQL suffix such as AUTOINCREMENT.
		data_types_suffix = {}
		# Mapping of Field objects to their SQL for CHECK constraints.
		data_type_check_constraints = {}
		ops = None
		vendor = 'unknown'
		SchemaEditorClass = None

django/db/backends/creation.py

+0 −4

Original line number	Diff line number	Diff line
		@@ -26,10 +26,6 @@ class BaseDatabaseCreation(object):
		Fields, the SQL used to create and destroy tables, and the creation and
		destruction of test databases.
		"""
		data_types = {}
		data_types_suffix = {}
		data_type_check_constraints = {}

		def __init__(self, connection):
		self.connection = connection

django/db/backends/mysql/base.py

+39 −0

Original line number	Diff line number	Diff line
		@@ -415,6 +415,45 @@ class DatabaseOperations(BaseDatabaseOperations):

		class DatabaseWrapper(BaseDatabaseWrapper):
		vendor = 'mysql'
		# This dictionary maps Field objects to their associated MySQL column
		# types, as strings. Column-type strings can contain format strings; they'll
		# be interpolated against the values of Field.__dict__ before being output.
		# If a column type is set to None, it won't be included in the output.
		_data_types = {
		'AutoField': 'integer AUTO_INCREMENT',
		'BinaryField': 'longblob',
		'BooleanField': 'bool',
		'CharField': 'varchar(%(max_length)s)',
		'CommaSeparatedIntegerField': 'varchar(%(max_length)s)',
		'DateField': 'date',
		'DateTimeField': 'datetime',
		'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)',
		'DurationField': 'bigint',
		'FileField': 'varchar(%(max_length)s)',
		'FilePathField': 'varchar(%(max_length)s)',
		'FloatField': 'double precision',
		'IntegerField': 'integer',
		'BigIntegerField': 'bigint',
		'IPAddressField': 'char(15)',
		'GenericIPAddressField': 'char(39)',
		'NullBooleanField': 'bool',
		'OneToOneField': 'integer',
		'PositiveIntegerField': 'integer UNSIGNED',
		'PositiveSmallIntegerField': 'smallint UNSIGNED',
		'SlugField': 'varchar(%(max_length)s)',
		'SmallIntegerField': 'smallint',
		'TextField': 'longtext',
		'TimeField': 'time',
		'UUIDField': 'char(32)',
		}

		@cached_property
		def data_types(self):
		if self.features.supports_microsecond_precision:
		return dict(self._data_types, DateTimeField='datetime(6)', TimeField='time(6)')
		else:
		return self._data_types

		operators = {
		'exact': '= %s',
		'iexact': 'LIKE %s',

django/db/backends/mysql/creation.py

+0 −39

Original line number	Diff line number	Diff line
		from django.db.backends.creation import BaseDatabaseCreation
		from django.utils.functional import cached_property


		class DatabaseCreation(BaseDatabaseCreation):
		# This dictionary maps Field objects to their associated MySQL column
		# types, as strings. Column-type strings can contain format strings; they'll
		# be interpolated against the values of Field.__dict__ before being output.
		# If a column type is set to None, it won't be included in the output.
		_data_types = {
		'AutoField': 'integer AUTO_INCREMENT',
		'BinaryField': 'longblob',
		'BooleanField': 'bool',
		'CharField': 'varchar(%(max_length)s)',
		'CommaSeparatedIntegerField': 'varchar(%(max_length)s)',
		'DateField': 'date',
		'DateTimeField': 'datetime',
		'DecimalField': 'numeric(%(max_digits)s, %(decimal_places)s)',
		'DurationField': 'bigint',
		'FileField': 'varchar(%(max_length)s)',
		'FilePathField': 'varchar(%(max_length)s)',
		'FloatField': 'double precision',
		'IntegerField': 'integer',
		'BigIntegerField': 'bigint',
		'IPAddressField': 'char(15)',
		'GenericIPAddressField': 'char(39)',
		'NullBooleanField': 'bool',
		'OneToOneField': 'integer',
		'PositiveIntegerField': 'integer UNSIGNED',
		'PositiveSmallIntegerField': 'smallint UNSIGNED',
		'SlugField': 'varchar(%(max_length)s)',
		'SmallIntegerField': 'smallint',
		'TextField': 'longtext',
		'TimeField': 'time',
		'UUIDField': 'char(32)',
		}

		@cached_property
		def data_types(self):
		if self.connection.features.supports_microsecond_precision:
		return dict(self._data_types, DateTimeField='datetime(6)', TimeField='time(6)')
		else:
		return self._data_types

		def sql_table_creation_suffix(self):
		suffix = []

django/db/backends/oracle/base.py

+42 −0

Original line number	Diff line number	Diff line
		@@ -575,6 +575,48 @@ class _UninitializedOperatorsDescriptor(object):

		class DatabaseWrapper(BaseDatabaseWrapper):
		vendor = 'oracle'
		# This dictionary maps Field objects to their associated Oracle column
		# types, as strings. Column-type strings can contain format strings; they'll
		# be interpolated against the values of Field.__dict__ before being output.
		# If a column type is set to None, it won't be included in the output.
		#
		# Any format strings starting with "qn_" are quoted before being used in the
		# output (the "qn_" prefix is stripped before the lookup is performed.
		data_types = {
		'AutoField': 'NUMBER(11)',
		'BinaryField': 'BLOB',
		'BooleanField': 'NUMBER(1)',
		'CharField': 'NVARCHAR2(%(max_length)s)',
		'CommaSeparatedIntegerField': 'VARCHAR2(%(max_length)s)',
		'DateField': 'DATE',
		'DateTimeField': 'TIMESTAMP',
		'DecimalField': 'NUMBER(%(max_digits)s, %(decimal_places)s)',
		'DurationField': 'INTERVAL DAY(9) TO SECOND(6)',
		'FileField': 'NVARCHAR2(%(max_length)s)',
		'FilePathField': 'NVARCHAR2(%(max_length)s)',
		'FloatField': 'DOUBLE PRECISION',
		'IntegerField': 'NUMBER(11)',
		'BigIntegerField': 'NUMBER(19)',
		'IPAddressField': 'VARCHAR2(15)',
		'GenericIPAddressField': 'VARCHAR2(39)',
		'NullBooleanField': 'NUMBER(1)',
		'OneToOneField': 'NUMBER(11)',
		'PositiveIntegerField': 'NUMBER(11)',
		'PositiveSmallIntegerField': 'NUMBER(11)',
		'SlugField': 'NVARCHAR2(%(max_length)s)',
		'SmallIntegerField': 'NUMBER(11)',
		'TextField': 'NCLOB',
		'TimeField': 'TIMESTAMP',
		'URLField': 'VARCHAR2(%(max_length)s)',
		'UUIDField': 'VARCHAR2(32)',
		}
		data_type_check_constraints = {
		'BooleanField': '%(qn_column)s IN (0,1)',
		'NullBooleanField': '(%(qn_column)s IN (0,1)) OR (%(qn_column)s IS NULL)',
		'PositiveIntegerField': '%(qn_column)s >= 0',
		'PositiveSmallIntegerField': '%(qn_column)s >= 0',
		}

		operators = _UninitializedOperatorsDescriptor()

		_standard_operators = {