- added "none" to the list of cascades, although im not sure if we should really...

diff --git a/lib/sqlalchemy/orm/util.py b/lib/sqlalchemy/orm/util.py
index 9fe0dc2a237bdf8ce2342c44ba4b4cc37c32b397..a3ba72812ed554e73d931e178cee0413d411773b 100644 (file)
--- a/lib/sqlalchemy/orm/util.py
+++ b/lib/sqlalchemy/orm/util.py
@@ -6,7 +6,7 @@
 
 from sqlalchemy import sql, util, exceptions
 
-all_cascades = util.Set(["delete", "delete-orphan", "all", "merge", "expunge", "save-update", "refresh-expire"])
+all_cascades = util.Set(["delete", "delete-orphan", "all", "merge", "expunge", "save-update", "refresh-expire", "none"])
 class CascadeOptions(object):
     """keeps track of the options sent to relation().cascade"""
     def __init__(self, arg=""):