Author: ikelly
Date: 2009-03-05 14:22:54 -0600 (Thu, 05 Mar 2009)
New Revision: 9977

Modified:
   django/branches/releases/1.0.X/
   django/branches/releases/1.0.X/docs/ref/databases.txt
   django/branches/releases/1.0.X/docs/ref/models/fields.txt
Log:
[1.0.X] Clarified documentation regarding Oracle's treatment of nulls and empty 
strings. Backport of [9976] from trunk.


Property changes on: django/branches/releases/1.0.X
___________________________________________________________________
Name: svnmerge-integrated
   - 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9813,9821-9837,9842-9843,9847-9859,9861,9863-9875,9877-9881,9883-9887,9899-9902,9906,9908
   + 
/django/trunk:1-9097,9099-9102,9104-9109,9111,9113-9144,9146-9151,9153-9156,9158-9159,9161-9187,9189-9247,9249-9262,9264-9277,9279-9298,9301-9302,9305-9331,9333-9343,9345,9347,9350-9352,9355-9396,9399-9462,9466-9469,9471-9488,9491-9526,9529,9533-9536,9539-9550,9556-9557,9559-9560,9562-9568,9570-9591,9595-9619,9621-9624,9626-9636,9638-9642,9644-9645,9647-9689,9691-9699,9703-9706,9709-9713,9716-9723,9725-9726,9730-9738,9740-9741,9750-9751,9757-9758,9761-9762,9767-9768,9770-9780,9782-9784,9789-9790,9793-9798,9801-9802,9806-9807,9809-9813,9821-9837,9842-9843,9847-9859,9861,9863-9875,9877-9881,9883-9887,9899-9902,9906,9908,9976

Modified: django/branches/releases/1.0.X/docs/ref/databases.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/databases.txt       2009-03-05 
20:21:22 UTC (rev 9976)
+++ django/branches/releases/1.0.X/docs/ref/databases.txt       2009-03-05 
20:22:54 UTC (rev 9977)
@@ -442,12 +442,13 @@
 NULL and empty strings
 ----------------------
 
-Django generally prefers to use the empty string ('') rather than NULL, but
-Oracle treats both identically. To get around this, the Oracle backend
-coerces the ``null=True`` option on fields that permit the empty string as a
-value. When fetching from the database, it is assumed that a NULL value in
-one of these fields really means the empty string, and the data is silently
-converted to reflect this assumption.
+Django generally prefers to use the empty string ('') rather than
+NULL, but Oracle treats both identically. To get around this, the
+Oracle backend coerces the ``null=True`` option on fields that have
+the empty string as a possible value. When fetching from the database,
+it is assumed that a NULL value in one of these fields really means
+the empty string, and the data is silently converted to reflect this
+assumption.
 
 ``TextField`` limitations
 -------------------------

Modified: django/branches/releases/1.0.X/docs/ref/models/fields.txt
===================================================================
--- django/branches/releases/1.0.X/docs/ref/models/fields.txt   2009-03-05 
20:21:22 UTC (rev 9976)
+++ django/branches/releases/1.0.X/docs/ref/models/fields.txt   2009-03-05 
20:22:54 UTC (rev 9977)
@@ -54,8 +54,8 @@
 .. note::
 
     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.
+    coerced for string-based fields that have the empty string as a possible
+    value, and the value ``NULL`` will be stored to denote the empty string.
 
 ``blank``
 ---------


--~--~---------~--~----~------------~-------~--~----~
You received this message because you are subscribed to the Google Groups 
"Django updates" group.
To post to this group, send email to [email protected]
To unsubscribe from this group, send email to 
[email protected]
For more options, visit this group at 
http://groups.google.com/group/django-updates?hl=en
-~----------~----~----~----~------~----~------~--~---

Reply via email to