summaryrefslogtreecommitdiff
path: root/docs
diff options
context:
space:
mode:
authorRussell Keith-Magee <russell@keith-magee.com>2010-12-21 06:05:40 +0000
committerRussell Keith-Magee <russell@keith-magee.com>2010-12-21 06:05:40 +0000
commite299ac0cae6623df3fe4c5fe26f2c1c3db8be1d6 (patch)
tree9296e20b767b1349112f520ad0654584516a4160 /docs
parentb60d5df07266dd4cd4f63afa6986ffb2932facc2 (diff)
Reverting r14994 (at request of SmileyChris) because of some backwards compatibility issues that need to be resolved.
git-svn-id: http://code.djangoproject.com/svn/django/trunk@14995 bcc190cf-cafb-0310-a4f2-bffc1f526a37
Diffstat (limited to 'docs')
-rw-r--r--docs/topics/serialization.txt23
1 files changed, 0 insertions, 23 deletions
diff --git a/docs/topics/serialization.txt b/docs/topics/serialization.txt
index 358f869a07..c8acc8539e 100644
--- a/docs/topics/serialization.txt
+++ b/docs/topics/serialization.txt
@@ -307,12 +307,6 @@ into the primary key of an actual ``Person`` object.
fields will be effectively unique, you can still use those fields
as a natural key.
-.. versionchanged:: 1.3
-
-Deserialization of objects with no primary key will always check whether the
-model's manager has a ``get_by_natural_key()`` method and if so, use it to
-populate the deserialized object's primary key.
-
Serialization of natural keys
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
@@ -359,23 +353,6 @@ use the `--natural` command line flag to generate natural keys.
natural keys during serialization, but *not* be able to load those
key values, just don't define the ``get_by_natural_key()`` method.
-.. versionchanged:: 1.3
-
-When ``use_natural_keys=True`` is specified, the primary key is no longer
-provided in the serialized data of this object since it can be calculated
-during deserialization::
-
- ...
- {
- "model": "store.person",
- "fields": {
- "first_name": "Douglas",
- "last_name": "Adams",
- "birth_date": "1952-03-11",
- }
- }
- ...
-
Dependencies during serialization
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~