From: Mike Bayer <mike_mp@zzzcomputing.com>
Date: Wed, 31 Oct 2007 17:15:30 +0000 (+0000)
Subject: dont call up new session unless save_on_init
X-Git-Tag: rel_0_4_1~86
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=60c3a1e8a22c999f93b402b7761fd185018eb2a9;p=thirdparty%2Fsqlalchemy%2Fsqlalchemy.git

dont call up new session unless save_on_init
---

diff --git a/lib/sqlalchemy/orm/scoping.py b/lib/sqlalchemy/orm/scoping.py
index 82692aad26..3f2f2f049f 100644
--- a/lib/sqlalchemy/orm/scoping.py
+++ b/lib/sqlalchemy/orm/scoping.py
@@ -118,7 +118,6 @@ class _ScopedExt(MapperExtension):
             class_.query = query()
         
     def init_instance(self, mapper, class_, oldinit, instance, args, kwargs):
-        session = kwargs.pop('_sa_session', self.context.registry())
         if not isinstance(oldinit, types.MethodType):
             for key, value in kwargs.items():
                 if self.validate:
@@ -126,6 +125,7 @@ class _ScopedExt(MapperExtension):
                         raise exceptions.ArgumentError("Invalid __init__ argument: '%s'" % key)
                 setattr(instance, key, value)
         if self.save_on_init:
+            session = kwargs.pop('_sa_session', self.context.registry())
             session._save_impl(instance, entity_name=kwargs.pop('_sa_entity_name', None))
         return EXT_CONTINUE