Commit 99a1265a authored by Niels Van Och's avatar Niels Van Och Committed by Tim Graham
Browse files

Fixed #25063 -- Added path to makemigration's output of migration file.

parent e0900707

django/core/management/commands/makemigrations.py

+6 −1
Original line number Diff line number Diff line
@@ -172,7 +172,12 @@ class Command(BaseCommand): 
                # Describe the migration

                writer = MigrationWriter(migration)

                if self.verbosity >= 1:

                    self.stdout.write("  %s:\n" % (self.style.MIGRATE_LABEL(writer.filename),))

                    # Display a relative path if it's below the current working

                    # directory, or an absolute path otherwise.

                    migration_string = os.path.relpath(writer.path)

                    if migration_string.startswith('..'):

                        migration_string = writer.path

                    self.stdout.write("  %s:\n" % (self.style.MIGRATE_LABEL(migration_string),))

                    for operation in migration.operations:

                        self.stdout.write("    - %s\n" % operation.describe())

                if not self.dry_run:

docs/intro/tutorial02.txt

+1 −1
Original line number Diff line number Diff line
@@ -227,7 +227,7 @@ You should see something similar to the following: 
.. code-block:: text



    Migrations for 'polls':

      0001_initial.py:

      polls/migrations/0001_initial.py:

        - Create model Choice

        - Create model Question

        - Add field question to choice

docs/ref/contrib/gis/tutorial.txt

+1 −1
Original line number Diff line number Diff line
@@ -239,7 +239,7 @@ create a database migration: 


    $ python manage.py makemigrations

    Migrations for 'world':

      0001_initial.py:

      world/migrations/0001_initial.py:

        - Create model WorldBorder



Let's look at the SQL that will generate the table for the ``WorldBorder``

docs/releases/1.10.txt

+3 −0
Original line number Diff line number Diff line
@@ -199,6 +199,9 @@ Management Commands 
  command exit with a non-zero status when model changes without migrations are

  detected.



* :djadmin:`makemigrations` now displays the path to the migration files that

  it generates.



Migrations

^^^^^^^^^^

docs/topics/migrations.txt

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ a field and remove a model - and then run :djadmin:`makemigrations`:: 


    $ python manage.py makemigrations

    Migrations for 'books':

      0003_auto.py:

      books/migrations/0003_auto.py:

        - Alter field author on book



Your models will be scanned and compared to the versions currently