- Added ScopedSession.is_active accessor. [ticket:976]

diff --git a/CHANGES b/CHANGES
index d1c001ec62a05c664e1347b4787bc1a7d8e9cbc8..d0c8ff1586413763c968135808c0199ae59e4e72 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -51,6 +51,8 @@ CHANGES
       is blocked and the exception will be reiterated on the 
       next compile() call.  This issue occurs frequently
       when using declarative.
+
+    - Added ScopedSession.is_active accessor. [ticket:976]
       
     - Corrected problem with Query.delete() and
       Query.update() not working properly with bind 

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 6e33be96bf929f02b632074f26158a8b9f6d58cd..5559784c76c1f3e1bc0b7a9fc9492f619c055285 100644 (file)
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -129,7 +129,7 @@ def makeprop(name):
     def get(self):
         return getattr(self.registry(), name)
     return property(get, set)
-for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map'):
+for prop in ('bind', 'dirty', 'deleted', 'new', 'identity_map', 'is_active'):
     setattr(ScopedSession, prop, makeprop(prop))
 
 def clslevel(name):

diff --git a/lib/sqlalchemy/orm/session.py b/lib/sqlalchemy/orm/session.py
index eb003fda28ff4e827aad5d1102e3022f63281576..3bc3fb4fc2838e488b7c76ce8e16c3ebded12f50 100644 (file)
--- a/lib/sqlalchemy/orm/session.py
+++ b/lib/sqlalchemy/orm/session.py
@@ -526,7 +526,7 @@ class Session(object):
     public_methods = (
         '__contains__', '__iter__', 'add', 'add_all', 'begin', 'begin_nested',
         'clear', 'close', 'commit', 'connection', 'delete', 'execute', 'expire',
-        'expire_all', 'expunge', 'flush', 'get_bind', 'is_modified',
+        'expire_all', 'expunge', 'flush', 'get_bind', 'is_modified', 
         'merge', 'query', 'refresh', 'rollback', 'save',
         'save_or_update', 'scalar', 'update')