added "add", "add_all", "expire_all" to SS

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index c1d3db9f1d34d66df1af60c0758bc89c3473f14f..37cc302977c2437b5302292d2852f78cfcacfb24 100644 (file)
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -106,7 +106,7 @@ def instrument(name):
     def do(self, *args, **kwargs):
         return getattr(self.registry(), name)(*args, **kwargs)
     return do
-for meth in ('get', 'load', 'close', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', '__contains__', '__iter__'):
+for meth in ('get', 'load', 'close', 'add', 'add_all', 'expire_all', 'save', 'commit', 'update', 'save_or_update', 'flush', 'query', 'delete', 'merge', 'clear', 'refresh', 'expire', 'expunge', 'rollback', 'begin', 'begin_nested', 'connection', 'execute', 'scalar', 'get_bind', 'is_modified', '__contains__', '__iter__'):
     setattr(ScopedSession, meth, instrument(meth))
 
 def makeprop(name):

diff --git a/test/orm/scoping.py b/test/orm/scoping.py
index 523f37671aa509d98cdee36b6332d6161ab41a0a..d885bae3dd412d8d4280caebe16fd4284446c6ac 100644 (file)
--- a/test/orm/scoping.py
+++ b/test/orm/scoping.py
@@ -34,7 +34,7 @@ class ScopedSessionTest(ORMTest):
         s = SomeObject(id=1, data="hello")
         sso = SomeOtherObject()
         s.options.append(sso)
-        Session.save(s)
+        Session.add(s)
         Session.commit()
         Session.refresh(sso)
         Session.remove()