]> git.ipfire.org Git - thirdparty/sqlalchemy/sqlalchemy.git/commitdiff
Corrected problem in docstring. rel_0_5beta3
authorMichael Trier <mtrier@gmail.com>
Mon, 4 Aug 2008 19:53:04 +0000 (19:53 +0000)
committerMichael Trier <mtrier@gmail.com>
Mon, 4 Aug 2008 19:53:04 +0000 (19:53 +0000)
lib/sqlalchemy/orm/__init__.py

index 447949283251332fc39eb2982b130f33ad3f140f..34867c871f7448f7b3d4878fe034ba39e914055c 100644 (file)
@@ -181,16 +181,23 @@ def relation(argument, secondary=None, **kwargs):
           to "False", which means the default cascade should be used.
           The default value is "save-update, merge".
           Available cascades are:
+
             save-update - cascade the "add()" operation 
             (formerly known as save() and update())
+
             merge - cascade the "merge()" operation
+            
             expunge - cascade the "expunge()" operation
+            
             delete - cascade the "delete()" operation
+            
             delete-orphan - if an item of the child's type with no parent is detected,
             mark it for deletion.  Note that this option prevents a pending item
             of the child's class from being persisted without a parent 
             present.
+            
             refresh-expire - cascade the expire() and refresh() operations
+            
             all - shorthand for "save-update,merge, refresh-expire, expunge, delete"
 
         collection_class