p15693087
/
django
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Renamed inspectdb field names for clarity

This commit is contained in:
Simon Charette 2013-01-31 20:00:25 -05:00 committed by Claude Paroz
parent b757e7ae18
commit 339944491c
2 changed files with 53 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

44
tests/regressiontests/inspectdb/models.py
View File

@ -32,25 +32,25 @@ class SpecialColumnName(models.Model):
class ColumnTypes(models.Model): class ColumnTypes(models.Model):
id = models.AutoField(primary_key=True) id = models.AutoField(primary_key=True)
field1 = models.BigIntegerField() big_int_field = models.BigIntegerField()
field2 = models.BooleanField() bool_field = models.BooleanField()
field2b = models.NullBooleanField() null_bool_field = models.NullBooleanField()
field3 = models.CharField(max_length=10) char_field = models.CharField(max_length=10)
field4 = models.CommaSeparatedIntegerField(max_length=99) comma_separated_int_field = models.CommaSeparatedIntegerField(max_length=99)
field5 = models.DateField() date_field = models.DateField()
field6 = models.DateTimeField() date_time_field = models.DateTimeField()
field7 = models.DecimalField(max_digits=6, decimal_places=1) decimal_field = models.DecimalField(max_digits=6, decimal_places=1)
field8 = models.EmailField() email_field = models.EmailField()
field9 = models.FileField(upload_to="unused") file_field = models.FileField(upload_to="unused")
field10 = models.FilePathField() file_path_field = models.FilePathField()
field11 = models.FloatField() float_field = models.FloatField()
field12 = models.IntegerField() int_field = models.IntegerField()
field13 = models.IPAddressField() ip_address_field = models.IPAddressField()
field14 = models.GenericIPAddressField(protocol="ipv4") gen_ip_adress_field = models.GenericIPAddressField(protocol="ipv4")
field16 = models.PositiveIntegerField() pos_int_field = models.PositiveIntegerField()
field17 = models.PositiveSmallIntegerField() pos_small_int_field = models.PositiveSmallIntegerField()
field18 = models.SlugField() slug_field = models.SlugField()
field19 = models.SmallIntegerField() small_int_field = models.SmallIntegerField()
field20 = models.TextField() text_field = models.TextField()
field21 = models.TimeField() time_field = models.TimeField()
field22 = models.URLField() url_field = models.URLField()

68
tests/regressiontests/inspectdb/tests.py
View File

@ -35,61 +35,55 @@ class InspectDBTestCase(TestCase):
self.assertEqual(definition, out_def) self.assertEqual(definition, out_def)
assertFieldType('id', "models.IntegerField(primary_key=True)") assertFieldType('id', "models.IntegerField(primary_key=True)")
assertFieldType('field1', "models.BigIntegerField()") assertFieldType('big_int_field', "models.BigIntegerField()")
if connection.vendor == 'mysql': if connection.vendor == 'mysql':
# No native boolean type on MySQL # No native boolean type on MySQL
assertFieldType('field2', "models.IntegerField()") assertFieldType('bool_field', "models.IntegerField()")
assertFieldType('field2b', "models.IntegerField(null=True, blank=True)") assertFieldType('null_bool_field', "models.IntegerField(blank=True, null=True)")
else: else:
assertFieldType('field2', "models.BooleanField()") assertFieldType('bool_field', "models.BooleanField()")
assertFieldType('field2b', "models.NullBooleanField()") assertFieldType('null_bool_field', "models.NullBooleanField()")
assertFieldType('field3', "models.CharField(max_length=10)") assertFieldType('char_field', "models.CharField(max_length=10)")
# CommaSeparatedIntegerField assertFieldType('comma_separated_int_field', "models.CharField(max_length=99)")
assertFieldType('field4', "models.CharField(max_length=99)") assertFieldType('date_field', "models.DateField()")
assertFieldType('field5', "models.DateField()") assertFieldType('date_time_field', "models.DateTimeField()")
assertFieldType('field6', "models.DateTimeField()")
if connection.vendor == 'sqlite': if connection.vendor == 'sqlite':
# Ticket #5014 # Ticket #5014
assertFieldType('field7', "models.DecimalField(max_digits=None, decimal_places=None)") assertFieldType('decimal_field', "models.DecimalField(max_digits=None, decimal_places=None)")
elif connection.vendor == 'mysql': elif connection.vendor == 'mysql':
pass # Ticket #5014 pass # Ticket #5014
else: else:
assertFieldType('field7', "models.DecimalField(max_digits=6, decimal_places=1)") assertFieldType('decimal_field', "models.DecimalField(max_digits=6, decimal_places=1)")
# EmailField assertFieldType('email_field', "models.CharField(max_length=75)")
assertFieldType('field8', "models.CharField(max_length=75)") assertFieldType('file_field', "models.CharField(max_length=100)")
# FileField assertFieldType('file_path_field', "models.CharField(max_length=100)")
assertFieldType('field9', "models.CharField(max_length=100)") assertFieldType('float_field', "models.FloatField()")
# FilePathField assertFieldType('int_field', "models.IntegerField()")
assertFieldType('field10', "models.CharField(max_length=100)")
assertFieldType('field11', "models.FloatField()")
assertFieldType('field12', "models.IntegerField()")
if connection.vendor == 'postgresql': if connection.vendor == 'postgresql':
# Only PostgreSQL has a specific type # Only PostgreSQL has a specific type
assertFieldType('field13', "models.GenericIPAddressField()") assertFieldType('ip_address_field', "models.GenericIPAddressField()")
assertFieldType('field14', "models.GenericIPAddressField()") assertFieldType('gen_ip_adress_field', "models.GenericIPAddressField()")
else: else:
assertFieldType('field13', "models.CharField(max_length=15)") assertFieldType('ip_address_field', "models.CharField(max_length=15)")
assertFieldType('field14', "models.CharField(max_length=39)") assertFieldType('gen_ip_adress_field', "models.CharField(max_length=39)")
if connection.vendor == 'sqlite': if connection.vendor == 'sqlite':
assertFieldType('field16', "models.PositiveIntegerField()") assertFieldType('pos_int_field', "models.PositiveIntegerField()")
assertFieldType('field17', "models.PositiveSmallIntegerField()") assertFieldType('pos_small_int_field', "models.PositiveSmallIntegerField()")
else: else:
# 'unsigned' property undetected on other backends # 'unsigned' property undetected on other backends
assertFieldType('field16', "models.IntegerField()") assertFieldType('pos_int_field', "models.IntegerField()")
if connection.vendor == 'postgresql': if connection.vendor == 'postgresql':
assertFieldType('field17', "models.SmallIntegerField()") assertFieldType('pos_small_int_field', "models.SmallIntegerField()")
else: else:
assertFieldType('field17', "models.IntegerField()") assertFieldType('pos_small_int_field', "models.IntegerField()")
# SlugField assertFieldType('slug_field', "models.CharField(max_length=50)")
assertFieldType('field18', "models.CharField(max_length=50)")
if connection.vendor in ('sqlite', 'postgresql'): if connection.vendor in ('sqlite', 'postgresql'):
assertFieldType('field19', "models.SmallIntegerField()") assertFieldType('small_int_field', "models.SmallIntegerField()")
else: else:
assertFieldType('field19', "models.IntegerField()") assertFieldType('small_int_field', "models.IntegerField()")
assertFieldType('field20', "models.TextField()") assertFieldType('text_field', "models.TextField()")
assertFieldType('field21', "models.TimeField()") assertFieldType('time_field', "models.TimeField()")
# URLField assertFieldType('url_field', "models.CharField(max_length=200)")
assertFieldType('field22', "models.CharField(max_length=200)")
@skipUnlessDBFeature('can_introspect_foreign_keys') @skipUnlessDBFeature('can_introspect_foreign_keys')
def test_attribute_name_not_python_keyword(self): def test_attribute_name_not_python_keyword(self):