diff options
| author | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-07-01 05:55:01 +0000 |
|---|---|---|
| committer | Malcolm Tredinnick <malcolm.tredinnick@gmail.com> | 2007-07-01 05:55:01 +0000 |
| commit | a61d4ebd5f4b49b296063eae603faa3c456d26e5 (patch) | |
| tree | 3b88cfd1865e4a77400ec2becddaf93851f27f57 /docs/model-api.txt | |
| parent | b89d409bf7ed7f9d6248c1ec188e241bdf5d4aa2 (diff) | |
unicode: Merged changes from trunk up to [5579].
git-svn-id: http://code.djangoproject.com/svn/django/branches/unicode@5580 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs/model-api.txt')
| -rw-r--r-- | docs/model-api.txt | 17 |
1 files changed, 11 insertions, 6 deletions
diff --git a/docs/model-api.txt b/docs/model-api.txt index 074e5fec82..4b0bc0d238 100644 --- a/docs/model-api.txt +++ b/docs/model-api.txt @@ -493,9 +493,9 @@ possible values for "no data;" Django convention is to use the empty string, not ``NULL``. .. note:: - Due to database limitations, when using the Oracle backend the - ``null=True`` option will be coerced for string-based fields that can - blank, and the value ``NULL`` will be stored to denote the empty string. + When using the Oracle database backend, the ``null=True`` option will + be coerced for string-based fields that can blank, and the value + ``NULL`` will be stored to denote the empty string. ``blank`` ~~~~~~~~~ @@ -594,9 +594,12 @@ statement for this field. ``db_tablespace`` ~~~~~~~~~~~~~~~~~ -If this field is indexed, the name of the database tablespace to use for the -index. The default is the ``db_tablespace`` of the model, if any. If the -backend doesn't support tablespaces, this option is ignored. +**New in Django development version** + +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`` ~~~~~~~~~~~ @@ -1011,6 +1014,8 @@ that's OK. Django quotes column and table names behind the scenes. ``db_tablespace`` ----------------- +**New in Django development version** + The name of the database tablespace to use for the model. If the backend doesn't support tablespaces, this option is ignored. |