summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
Diffstat (limited to 'docs')
-rw-r--r--docs/intro/tutorial01.txt11
-rw-r--r--docs/ref/contrib/gis/tutorial.txt3
-rw-r--r--docs/ref/django-admin.txt6
-rw-r--r--docs/releases/1.9.txt4
4 files changed, 23 insertions, 1 deletions
diff --git a/docs/intro/tutorial01.txt b/docs/intro/tutorial01.txt
index 8fd59408eb..9f728207ca 100644
--- a/docs/intro/tutorial01.txt
+++ b/docs/intro/tutorial01.txt
@@ -446,8 +446,8 @@ You should see something similar to the following:
Migrations for 'polls':
0001_initial.py:
- - Create model Question
- Create model Choice
+ - Create model Question
- Add field question to choice
By running ``makemigrations``, you're telling Django that you've made
@@ -476,16 +476,25 @@ readability):
.. code-block:: sql
BEGIN;
+ --
+ -- Create model Choice
+ --
CREATE TABLE "polls_choice" (
"id" serial NOT NULL PRIMARY KEY,
"choice_text" varchar(200) NOT NULL,
"votes" integer NOT NULL
);
+ --
+ -- Create model Question
+ --
CREATE TABLE "polls_question" (
"id" serial NOT NULL PRIMARY KEY,
"question_text" varchar(200) NOT NULL,
"pub_date" timestamp with time zone NOT NULL
);
+ --
+ -- Add field question to choice
+ --
ALTER TABLE "polls_choice" ADD COLUMN "question_id" integer NOT NULL;
ALTER TABLE "polls_choice" ALTER COLUMN "question_id" DROP DEFAULT;
CREATE INDEX "polls_choice_7aa0f6ee" ON "polls_choice" ("question_id");
diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index c93e55ec69..ea78274781 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -286,6 +286,9 @@ This command should produce the following output:
.. code-block:: sql
BEGIN;
+ --
+ -- Create model WorldBorder
+ --
CREATE TABLE "world_worldborder" (
"id" serial NOT NULL PRIMARY KEY,
"name" varchar(50) NOT NULL,
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index e9dbe4b746..3515c615e7 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -984,6 +984,12 @@ By default, the SQL created is for running the migration in the forwards
direction. Pass ``--backwards`` to generate the SQL for
unapplying the migration instead.
+.. versionchanged:: 1.9
+
+ To increase the readability of the overall SQL output the SQL code
+ generated for each migration operation is preceded by the operation's
+ description.
+
sqlsequencereset <app_label app_label ...>
------------------------------------------
diff --git a/docs/releases/1.9.txt b/docs/releases/1.9.txt
index 16a9e9d5f8..aebdc7ba85 100644
--- a/docs/releases/1.9.txt
+++ b/docs/releases/1.9.txt
@@ -152,6 +152,10 @@ Management Commands
* The new :djadmin:`sendtestemail` command lets you send a test email to
easily confirm that email sending through Django is working.
+* To increase the readability of the SQL code generated by
+ :djadmin:`sqlmigrate`, the SQL code generated for each migration operation is
+ preceded by the operation's description.
+
Models
^^^^^^