diff options
| author | Michael Trier <mtrier@gmail.com> | 2008-08-04 19:53:04 +0000 |
|---|---|---|
| committer | Michael Trier <mtrier@gmail.com> | 2008-08-04 19:53:04 +0000 |
| commit | 045d0d63ea004f1fa2a0cb1ca171065caa1d3455 (patch) | |
| tree | 907209dddc787d0ef15a110550819b4f1324830b /lib | |
| parent | d371637af055805f347ad177f5b457bccbbc3150 (diff) | |
| download | sqlalchemy-045d0d63ea004f1fa2a0cb1ca171065caa1d3455.tar.gz | |
Corrected problem in docstring.rel_0_5beta3
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/sqlalchemy/orm/__init__.py | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/lib/sqlalchemy/orm/__init__.py b/lib/sqlalchemy/orm/__init__.py index 447949283..34867c871 100644 --- a/lib/sqlalchemy/orm/__init__.py +++ b/lib/sqlalchemy/orm/__init__.py @@ -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 |
