summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorTim Graham <timograham@gmail.com>2015-06-30 14:23:29 -0400
committerTim Graham <timograham@gmail.com>2015-06-30 14:25:45 -0400
commitfdaf9359ab84b06da48f3bb0d5a924b62ace0561 (patch)
tree17dcec9043b1153f88862f3f03d9eb3903d7c022
parent8922266a8d832ecb64a2e4b34f80bd98855b3138 (diff)
[1.8.x] Fixed #25038 -- Reverted incorrect documentation about inspectdb introspecting views.
This reverts commit e69eea73d94c058728143416058a6257c765a9b8 (refs #24177).
-rw-r--r--docs/ref/django-admin.txt15
-rw-r--r--docs/releases/1.8.txt3
2 files changed, 5 insertions, 13 deletions
diff --git a/docs/ref/django-admin.txt b/docs/ref/django-admin.txt
index d12453c387..b5008157ce 100644
--- a/docs/ref/django-admin.txt
+++ b/docs/ref/django-admin.txt
@@ -352,17 +352,17 @@ inspectdb
.. django-admin:: inspectdb
-Introspects the database tables and views in the database pointed-to by the
+Introspects the database tables in the database pointed-to by the
:setting:`NAME` setting and outputs a Django model module (a ``models.py``
file) to standard output.
Use this if you have a legacy database with which you'd like to use Django.
-The script will inspect the database and create a model for each table or view
-within it.
+The script will inspect the database and create a model for each table within
+it.
As you might expect, the created models will have an attribute for every field
-in the table or view. Note that ``inspectdb`` has a few special cases in its
-field-name output:
+in the table. Note that ``inspectdb`` has a few special cases in its field-name
+output:
* If ``inspectdb`` cannot map a column's type to a model field type, it'll
use ``TextField`` and will insert the Python comment
@@ -405,11 +405,6 @@ it because ``True`` is its default value).
The :djadminopt:`--database` option may be used to specify the
database to introspect.
-.. versionadded:: 1.8
-
- A feature to inspect database views was added. In previous versions, only
- tables (not views) were inspected.
-
loaddata <fixture fixture ...>
------------------------------
diff --git a/docs/releases/1.8.txt b/docs/releases/1.8.txt
index 2b755ef7c7..1f44a86af4 100644
--- a/docs/releases/1.8.txt
+++ b/docs/releases/1.8.txt
@@ -423,9 +423,6 @@ Management Commands
introspect :class:`~django.db.models.AutoField` for MySQL and PostgreSQL
databases.
-* :djadmin:`inspectdb` now introspects database views on all database backends.
- In previous versions, only tables (not views) were inspected.
-
* When calling management commands from code through :ref:`call_command
<call-command>` and passing options, the option name can match the command
line option name (without the initial dashes) or the final option destination