summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGabriel Muñumel <gabrielmunumel@gmail.com>2014-07-28 10:05:41 -0400
committerTim Graham <timograham@gmail.com>2014-07-28 10:06:06 -0400
commit2077bbe3fefb58eadfde0f2f36af13a0f1d3704a (patch)
treec20534560559651f658732002d1ebf9c71f3f5fe
parentd82cf95c5260eb690429f22055f7af9aa6ef2cb9 (diff)
[1.7.x] Fixed #23102 -- Documented that sql* commands now respect allow_migrate().
Backport of 0af593dbe5 from master
-rw-r--r--docs/ref/django-admin.txt7
-rw-r--r--docs/releases/1.7.txt5
2 files changed, 12 insertions, 0 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index bfd6d791fd..f656c3703e 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -1044,6 +1044,13 @@ specify initial data.
The :djadminopt:`--database` option can be used to specify the database for
which to print the SQL.
+.. versionchanged:: 1.7
+
+ The ``sql*`` management commands now respect the ``allow_migrate()`` method
+ of :setting:`DATABASE_ROUTERS`. If you have models synced to non-default
+ databases, use the :djadminopt:`--database` flag to get SQL for those
+ models (previously they would always be included in the output).
+
sqlclear <app_label app_label ...>
----------------------------------
diff --git a/docs/releases/1.7.txt b/docs/releases/1.7.txt
index 1b24b87aa8..25019a6beb 100644
--- a/docs/releases/1.7.txt
+++ b/docs/releases/1.7.txt
@@ -1418,6 +1418,11 @@ Miscellaneous
please update your settings to use ``None`` instead of ``0`` as the latter
now designates set-and-expire in the settings as well.
+* The ``sql*`` management commands now respect the ``allow_migrate()`` method
+ of :setting:`DATABASE_ROUTERS`. If you have models synced to non-default
+ databases, use the :djadminopt:`--database` flag to get SQL for those
+ models (previously they would always be included in the output).
+
.. _deprecated-features-1.7:
Features deprecated in 1.7