Commit ad8ebb70 authored by Julien Phalip's avatar Julien Phalip
Browse files

Fixed #8317 -- Corrected the inspectdb management command to properly set... 

Fixed #8317 -- Corrected the inspectdb management command to properly set `primary_key=True` and `unique=True` on foreign keys. Thanks to bthomas for the report and patch, and to David Gouldin for the tests.

git-svn-id: http://code.djangoproject.com/svn/django/trunk@17451 bcc190cf-cafb-0310-a4f2-bffc1f526a37
parent d02ba7f4

django/core/management/commands/inspectdb.py

+10 −10
Original line number Diff line number Diff line
@@ -62,6 +62,13 @@ class Command(NoArgsCommand): 
                if ' ' in att_name or '-' in att_name or keyword.iskeyword(att_name) or column_name != att_name:

                    extra_params['db_column'] = column_name



                # Add primary_key and unique, if necessary.

                if column_name in indexes:

                    if indexes[column_name]['primary_key']:

                        extra_params['primary_key'] = True

                    elif indexes[column_name]['unique']:

                        extra_params['unique'] = True



                # Modify the field name to make it Python-compatible.

                if ' ' in att_name:

                    att_name = att_name.replace(' ', '_')
@@ -88,13 +95,6 @@ class Command(NoArgsCommand): 
                    extra_params.update(field_params)

                    comment_notes.extend(field_notes)



                    # Add primary_key and unique, if necessary.

                    if column_name in indexes:

                        if indexes[column_name]['primary_key']:

                            extra_params['primary_key'] = True

                        elif indexes[column_name]['unique']:

                            extra_params['unique'] = True



                    field_type += '('



                if keyword.iskeyword(att_name):

tests/regressiontests/inspectdb/models.py

+9 −0
Original line number Diff line number Diff line
@@ -6,3 +6,12 @@ class People(models.Model): 


class Message(models.Model):

    from_field = models.ForeignKey(People, db_column='from_id')



class PeopleData(models.Model):

    people_pk = models.ForeignKey(People, primary_key=True)

    ssn = models.CharField(max_length=11)



class PeopleMoreData(models.Model):

    people_unique = models.ForeignKey(People, unique=True)

    license = models.CharField(max_length=255)

tests/regressiontests/inspectdb/tests.py

+4 −0
Original line number Diff line number Diff line
@@ -13,4 +13,8 @@ class InspectDBTestCase(TestCase): 
        error_message = "inspectdb generated an attribute name which is a python keyword"

        self.assertNotIn("from = models.ForeignKey(InspectdbPeople)", out.getvalue(), msg=error_message)

        self.assertIn("from_field = models.ForeignKey(InspectdbPeople)", out.getvalue())

        self.assertIn("people_pk = models.ForeignKey(InspectdbPeople, primary_key=True)",

            out.getvalue())

        self.assertIn("people_unique = models.ForeignKey(InspectdbPeople, unique=True)",

            out.getvalue())

        out.close()