Commit c89d80e2 authored by Michael Manfre's avatar Michael Manfre Committed by Anssi Kääriäinen
Browse files

Fixed #21097 - Added DatabaseFeature.can_introspect_autofield

parent 6feb7512

django/core/management/commands/inspectdb.py

+5 −2
Original line number Diff line number Diff line
@@ -104,8 +104,11 @@ class Command(NoArgsCommand): 


                # Don't output 'id = meta.AutoField(primary_key=True)', because

                # that's assumed if it doesn't exist.

                if att_name == 'id' and field_type == 'AutoField(' and extra_params == {'primary_key': True}:

                if att_name == 'id' and extra_params == {'primary_key': True}:

                    if field_type == 'AutoField(':

                        continue

                    elif field_type == 'IntegerField(' and not connection.features.can_introspect_autofield:

                        comment_notes.append('AutoField?')



                # Add 'null' and 'blank', if the 'null_ok' flag was present in the

                # table description.

django/db/backends/__init__.py

+3 −0
Original line number Diff line number Diff line
@@ -627,6 +627,9 @@ class BaseDatabaseFeatures(object): 
    # which can't do it for MyISAM tables

    can_introspect_foreign_keys = True



    # Can the backend introspect an AutoField, instead of an IntegerField?

    can_introspect_autofield = False



    # Support for the DISTINCT ON clause

    can_distinct_on_fields = False

tests/inspectdb/tests.py

+2 −1
Original line number Diff line number Diff line
@@ -42,7 +42,8 @@ class InspectDBTestCase(TestCase): 
            out_def = re.search(r'^\s*%s = (models.*)$' % name, output, re.MULTILINE).groups()[0]

            self.assertEqual(definition, out_def)



        assertFieldType('id', "models.IntegerField(primary_key=True)")

        if not connection.features.can_introspect_autofield:

            assertFieldType('id', "models.IntegerField(primary_key=True) # AutoField?")

        assertFieldType('big_int_field', "models.BigIntegerField()")

        if connection.vendor == 'mysql':

            # No native boolean type on MySQL

tests/introspection/tests.py

+3 −2
Original line number Diff line number Diff line
@@ -66,8 +66,9 @@ class IntrospectionTests(TestCase): 
        # field type on MySQL

        self.assertEqual(

            [datatype(r[1], r) for r in desc],

            ['IntegerField', 'CharField', 'CharField', 'CharField',

             'BigIntegerField', 'BinaryField' if connection.vendor != 'mysql' else 'TextField']

            ['AutoField' if connection.features.can_introspect_autofield else 'IntegerField',

             'CharField', 'CharField', 'CharField', 'BigIntegerField',

             'BinaryField' if connection.vendor != 'mysql' else 'TextField']

        )



    # The following test fails on Oracle due to #17202 (can't correctly