Merge branch 'orm-collections-list-clear' of github.com:schettino72/sqlalchemy into list_clear

2 files changed, 18 insertions, 0 deletions

diff --git a/lib/sqlalchemy/orm/collections.py b/lib/sqlalchemy/orm/collections.py
index 6bd5ac968..ffd0b8c37 100644
--- a/lib/sqlalchemy/orm/collections.py
+++ b/lib/sqlalchemy/orm/collections.py
@@ -1161,6 +1161,14 @@ def _list_decorators():
         _tidy(pop)
         return pop
 
+    def clear(fn):
+        def clear(self, index=-1):
+            for item in self:
+                __del(self, item)
+            fn(self)
+        _tidy(clear)
+        return clear
+
     # __imul__ : not wrapping this.  all members of the collection are already
     # present, so no need to fire appends... wrapping it with an explicit
     # decorator is still possible, so events on *= can be had if they're
diff --git a/test/orm/test_collection.py b/test/orm/test_collection.py
index f6493f1a8..f94c742b3 100644
--- a/test/orm/test_collection.py
+++ b/test/orm/test_collection.py
@@ -284,6 +284,16 @@ class CollectionsTest(fixtures.ORMTest):
             del control[:]
             assert_eq()
 
+        if hasattr(direct, 'clear'):
+            for i in range(1, 4):
+                e = creator()
+                direct.append(e)
+                control.append(e)
+
+            direct.clear()
+            control.clear()
+            assert_eq()
+
         if hasattr(direct, 'extend'):
             values = [creator(), creator(), creator()]