mirror of
https://github.com/django/django.git
synced 2025-10-24 06:06:09 +00:00
[soc2009/multidb] Merged in all of Justin Bronn's GIS work. Multidb should now work fully with GIS. This is backwards incompatible, if you are using GIS, your ENGINE setting should now be django.contrib.gis.db.backends.XXX where XXX is the name of your DB backend. Thanks to Justin for all his work. This also resolves merge conflicts from the previous commit.
git-svn-id: http://code.djangoproject.com/svn/django/branches/soc2009/multidb@11813 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
Alex Gaynor
@@ -257,10 +257,7 @@ Here's a sample configuration which uses a MySQL option file::
|
||||
}
|
||||
}
|
||||
|
||||
<<<<<<< HEAD:docs/ref/databases.txt
|
||||
|
||||
=======
|
||||
>>>>>>> master:docs/ref/databases.txt
|
||||
# my.cnf
|
||||
[client]
|
||||
database = NAME
|
||||
|
||||
@@ -210,24 +210,6 @@ records to dump. If you're using a :ref:`custom manager <custom-managers>` as
|
||||
the default manager and it filters some of the available records, not all of the
|
||||
objects will be dumped.
|
||||
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
=======
|
||||
.. django-admin-option:: --exclude
|
||||
|
||||
.. versionadded:: 1.0
|
||||
|
||||
Exclude a specific application from the applications whose contents is
|
||||
output. For example, to specifically exclude the `auth` application from
|
||||
the output, you would call::
|
||||
|
||||
django-admin.py dumpdata --exclude=auth
|
||||
|
||||
If you want to exclude multiple applications, use multiple ``--exclude``
|
||||
directives::
|
||||
|
||||
django-admin.py dumpdata --exclude=auth --exclude=contenttypes
|
||||
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
.. django-admin-option:: --format <fmt>
|
||||
|
||||
By default, ``dumpdata`` will format its output in JSON, but you can use the
|
||||
@@ -239,14 +221,11 @@ are listed in :ref:`serialization-formats`.
|
||||
By default, ``dumpdata`` will output all data on a single line. This isn't
|
||||
easy for humans to read, so you can use the ``--indent`` option to
|
||||
pretty-print the output with a number of indentation spaces.
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
|
||||
.. versionadded:: 1.0
|
||||
|
||||
The :djadminopt:`--exclude` option may be provided to prevent specific
|
||||
applications from being dumped.
|
||||
=======
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
|
||||
.. versionadded:: 1.1
|
||||
|
||||
@@ -273,15 +252,12 @@ fixture will be re-installed.
|
||||
|
||||
The :djadminopt:`--noinput` option may be provided to suppress all user
|
||||
prompts.
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
|
||||
.. versionadded:: 1.2
|
||||
|
||||
The :djadminopt:`--database` option may be used to specify the database
|
||||
to flush.
|
||||
|
||||
=======
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
|
||||
inspectdb
|
||||
---------
|
||||
@@ -511,7 +487,6 @@ reset <appname appname ...>
|
||||
---------------------------
|
||||
|
||||
.. django-admin:: reset
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
|
||||
Executes the equivalent of ``sqlreset`` for the given app name(s).
|
||||
|
||||
@@ -522,13 +497,6 @@ prompts.
|
||||
|
||||
The :djadminopt:`--database` option can be used to specify the alias
|
||||
of the database to reset.
|
||||
=======
|
||||
|
||||
Executes the equivalent of ``sqlreset`` for the given app name(s).
|
||||
|
||||
The :djadminopt:`--noinput` option may be provided to suppress all user
|
||||
prompts.
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
|
||||
runfcgi [options]
|
||||
-----------------
|
||||
@@ -712,14 +680,11 @@ sqlflush
|
||||
|
||||
Prints the SQL statements that would be executed for the :djadmin:`flush`
|
||||
command.
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
|
||||
.. versionadded:: 1.2
|
||||
|
||||
The :djadminopt:`--database` option can be used to specify the database for
|
||||
which to print the SQL.
|
||||
=======
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
|
||||
sqlindexes <appname appname ...>
|
||||
--------------------------------
|
||||
@@ -819,7 +784,6 @@ with an appropriate extension (e.g. ``json`` or ``xml``). See the
|
||||
documentation for ``loaddata`` for details on the specification of fixture
|
||||
data files.
|
||||
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
--noinput
|
||||
~~~~~~~~~
|
||||
The :djadminopt:`--noinput` option may be provided to suppress all user
|
||||
@@ -829,27 +793,15 @@ prompts.
|
||||
|
||||
The :djadminopt:`--database` option can be used to specify the database to
|
||||
synchronize.
|
||||
=======
|
||||
The :djadminopt:`--noinput` option may be provided to suppress all user
|
||||
prompts.
|
||||
|
||||
test <app or test identifier>
|
||||
-----------------------------
|
||||
|
||||
.. django-admin:: test
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
|
||||
test <app or test identifier>
|
||||
-----------------------------
|
||||
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
.. django-admin:: test
|
||||
|
||||
Runs tests for all installed models. See :ref:`topics-testing` for more
|
||||
information.
|
||||
|
||||
=======
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
testserver <fixture fixture ...>
|
||||
--------------------------------
|
||||
|
||||
@@ -983,7 +935,6 @@ Common options
|
||||
The following options are not available on every commands, but they are
|
||||
common to a number of commands.
|
||||
|
||||
<<<<<<< HEAD:docs/ref/django-admin.txt
|
||||
.. django-admin-option:: --database
|
||||
|
||||
.. versionadded:: 1.2
|
||||
@@ -1008,8 +959,6 @@ directives::
|
||||
|
||||
django-admin.py dumpdata --exclude=auth --exclude=contenttypes
|
||||
|
||||
=======
|
||||
>>>>>>> master:docs/ref/django-admin.txt
|
||||
.. django-admin-option:: --locale
|
||||
|
||||
Use the ``--locale`` or ``-l`` option to specify the locale to process.
|
||||
|
||||
@@ -145,54 +145,6 @@ The default number of seconds to cache a page when the caching middleware or
|
||||
``cache_page()`` decorator is used.
|
||||
|
||||
.. setting:: CSRF_COOKIE_NAME
|
||||
<<<<<<< HEAD:docs/ref/settings.txt
|
||||
=======
|
||||
|
||||
CSRF_COOKIE_NAME
|
||||
----------------
|
||||
|
||||
.. versionadded:: 1.2
|
||||
|
||||
Default: ``'csrftoken'``
|
||||
|
||||
The name of the cookie to use for the CSRF authentication token. This can be whatever you
|
||||
want. See :ref:`ref-contrib-csrf`.
|
||||
|
||||
.. setting:: CSRF_COOKIE_DOMAIN
|
||||
|
||||
CSRF_COOKIE_DOMAIN
|
||||
------------------
|
||||
|
||||
.. versionadded:: 1.2
|
||||
|
||||
Default: ``None``
|
||||
|
||||
The domain to be used when setting the CSRF cookie. This can be useful for
|
||||
allowing cross-subdomain requests to be exluded from the normal cross site
|
||||
request forgery protection. It should be set to a string such as
|
||||
``".lawrence.com"`` to allow a POST request from a form on one subdomain to be
|
||||
accepted by accepted by a view served from another subdomain.
|
||||
|
||||
.. setting:: CSRF_FAILURE_VIEW
|
||||
|
||||
CSRF_FAILURE_VIEW
|
||||
-----------------
|
||||
|
||||
.. versionadded:: 1.2
|
||||
|
||||
Default: ``'django.views.csrf.csrf_failure'``
|
||||
|
||||
A dotted path to the view function to be used when an incoming request
|
||||
is rejected by the CSRF protection. The function should have this signature::
|
||||
|
||||
def csrf_failure(request, reason="")
|
||||
|
||||
where ``reason`` is a short message (intended for developers or logging, not for
|
||||
end users) indicating the reason the request was rejected. See
|
||||
:ref:`ref-contrib-csrf`.
|
||||
|
||||
.. setting:: DATABASE_ENGINE
|
||||
>>>>>>> master:docs/ref/settings.txt
|
||||
|
||||
CSRF_COOKIE_NAME
|
||||
----------------
|
||||
|
||||
Reference in New Issue
Block a user