Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Fixed #553 -- Added django.core.meta.fields.Field.get_internal_type()…

… hook, for creating custom meta.Field subclasses. Thanks, wojtek3

git-svn-id: http://code.djangoproject.com/svn/django/trunk@713 bcc190cf-cafb-0310-a4f2-bffc1f526a37
  • Loading branch information...
commit c1a16d54b0fce2ffe89eab9a69e689f87a4c1ddc 1 parent cd34c16
Adrian Holovaty adrianholovaty authored
1  django/core/db/backends/mysql.py
View
@@ -133,7 +133,6 @@ def get_relations(cursor, table_name):
'TimeField': 'time',
'URLField': 'varchar(200)',
'USStateField': 'varchar(2)',
- 'XMLField': 'longtext',
}
DATA_TYPES_REVERSE = {
1  django/core/db/backends/postgresql.py
View
@@ -170,7 +170,6 @@ def get_relations(cursor, table_name):
'TimeField': 'time',
'URLField': 'varchar(200)',
'USStateField': 'varchar(2)',
- 'XMLField': 'text',
}
# Maps type codes to Django Field types.
1  django/core/db/backends/sqlite3.py
View
@@ -170,7 +170,6 @@ def get_relations(cursor, table_name):
'TimeField': 'time',
'URLField': 'varchar(200)',
'USStateField': 'varchar(2)',
- 'XMLField': 'text',
}
DATA_TYPES_REVERSE = {}
6 django/core/management.py
View
@@ -47,7 +47,7 @@ def _is_valid_dir_name(s):
# If the foreign key points to an AutoField, the foreign key should be an
# IntegerField, not an AutoField. Otherwise, the foreign key should be the same
# type of field as the field to which it points.
-get_rel_data_type = lambda f: (f.__class__.__name__ == 'AutoField') and 'IntegerField' or f.__class__.__name__
+get_rel_data_type = lambda f: (f.get_internal_type() == 'AutoField') and 'IntegerField' or f.get_internal_type()
def get_sql_create(mod):
"Returns a list of the CREATE TABLE SQL statements for the given module."
@@ -62,7 +62,7 @@ def get_sql_create(mod):
data_type = get_rel_data_type(rel_field)
else:
rel_field = f
- data_type = f.__class__.__name__
+ data_type = f.get_internal_type()
col_type = db.DATA_TYPES[data_type]
if col_type is not None:
field_output = [f.column, col_type % rel_field.__dict__]
@@ -634,7 +634,7 @@ def createcachetable(tablename):
table_output = []
index_output = []
for f in fields:
- field_output = [f.column, db.DATA_TYPES[f.__class__.__name__] % f.__dict__]
+ field_output = [f.column, db.DATA_TYPES[f.get_internal_type()] % f.__dict__]
field_output.append("%sNULL" % (not f.null and "NOT " or ""))
if f.unique:
field_output.append("UNIQUE")
8 django/core/meta/fields.py
View
@@ -114,6 +114,9 @@ def get_db_column(self):
def get_cache_name(self):
return '_%s_cache' % self.name
+ def get_internal_type(self):
+ return self.__class__.__name__
+
def pre_save(self, value, add):
"Returns field's value just before saving."
return value
@@ -552,11 +555,14 @@ class USStateField(Field):
def get_manipulator_field_objs(self):
return [formfields.USStateField]
-class XMLField(Field):
+class XMLField(TextField):
def __init__(self, verbose_name=None, name=None, schema_path=None, **kwargs):
self.schema_path = schema_path
Field.__init__(self, verbose_name, name, **kwargs)
+ def get_internal_type(self):
+ return "TextField"
+
def get_manipulator_field_objs(self):
return [curry(formfields.XMLLargeTextField, schema_path=self.schema_path)]
Please sign in to comment.
Something went wrong with that request. Please try again.