Fixed some awkward wordings from docs/model-api.txt from [5519] and added 'new in Django development version' notes
git-svn-id: http://code.djangoproject.com/svn/django/trunk@5560 bcc190cf-cafb-0310-a4f2-bffc1f526a37
This commit is contained in:
parent
4fdbd7e3a2
commit
8cea4c7c5e
|
@ -493,9 +493,9 @@ possible values for "no data;" Django convention is to use the empty
|
||||||
string, not ``NULL``.
|
string, not ``NULL``.
|
||||||
|
|
||||||
.. note::
|
.. note::
|
||||||
Due to database limitations, when using the Oracle backend the
|
When using the Oracle database backend, the ``null=True`` option will
|
||||||
``null=True`` option will be coerced for string-based fields that can
|
be coerced for string-based fields that can blank, and the value
|
||||||
blank, and the value ``NULL`` will be stored to denote the empty string.
|
``NULL`` will be stored to denote the empty string.
|
||||||
|
|
||||||
``blank``
|
``blank``
|
||||||
~~~~~~~~~
|
~~~~~~~~~
|
||||||
|
@ -594,9 +594,12 @@ statement for this field.
|
||||||
``db_tablespace``
|
``db_tablespace``
|
||||||
~~~~~~~~~~~~~~~~~
|
~~~~~~~~~~~~~~~~~
|
||||||
|
|
||||||
If this field is indexed, the name of the database tablespace to use for the
|
**New in Django development version**
|
||||||
index. The default is the ``db_tablespace`` of the model, if any. If the
|
|
||||||
backend doesn't support tablespaces, this option is ignored.
|
The name of the database tablespace to use for this field's index, if
|
||||||
|
indeed this field is indexed. The default is the ``db_tablespace`` of
|
||||||
|
the model, if any. If the backend doesn't support tablespaces, this
|
||||||
|
option is ignored.
|
||||||
|
|
||||||
``default``
|
``default``
|
||||||
~~~~~~~~~~~
|
~~~~~~~~~~~
|
||||||
|
@ -1011,6 +1014,8 @@ that's OK. Django quotes column and table names behind the scenes.
|
||||||
``db_tablespace``
|
``db_tablespace``
|
||||||
-----------------
|
-----------------
|
||||||
|
|
||||||
|
**New in Django development version**
|
||||||
|
|
||||||
The name of the database tablespace to use for the model. If the backend
|
The name of the database tablespace to use for the model. If the backend
|
||||||
doesn't support tablespaces, this option is ignored.
|
doesn't support tablespaces, this option is ignored.
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue