[1.7.x] Fixed #23303 -- Added BEGIN and COMMIT statements to the output of sqlmigrate.

Backport of 5853c87a458f62ebd62d7809168355610de2570c from master.

Conflicts:
	django/core/management/commands/sqlmigrate.py
	tests/user_commands/tests.py

2 files changed, 4 insertions, 0 deletions

diff --git a/docs/ref/contrib/gis/tutorial.txt b/docs/ref/contrib/gis/tutorial.txt
index 339c9a481e..327427e94c 100644
--- a/docs/ref/contrib/gis/tutorial.txt
+++ b/docs/ref/contrib/gis/tutorial.txt
@@ -285,6 +285,7 @@ This command should produce the following output:
 
 .. code-block:: sql
 
+    BEGIN;
     CREATE TABLE "world_worldborder" (
         "id" serial NOT NULL PRIMARY KEY,
         "name" varchar(50) NOT NULL,
@@ -302,6 +303,7 @@ This command should produce the following output:
     )
     ;
     CREATE INDEX "world_worldborder_mpoly_id" ON "world_worldborder" USING GIST ( "mpoly" );
+    COMMIT;
 
 .. note::
 
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index 03fbef028f..7d464d92d4 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1127,6 +1127,8 @@ Prints the SQL for the named migration. This requires an active database
 connection, which it will use to resolve constraint names; this means you must
 generate the SQL against a copy of the database you wish to later apply it on.
 
+Note that ``sqlmigrate`` doesn't colorize its output.
+
 The :djadminopt:`--database` option can be used to specify the database for
 which to generate the SQL.