Changeset 480 for elixir/trunk/elixir/entity.py

Timestamp:

09/30/09 14:58:16 (2 years ago)

Author:

ged

Message:

- Provide our own Session.mapper equivalent to avoid SQLAlchemy 0.5.5+

deprecation warning. This mapper autosave object instances on init unless
save_on_init=False is passed as a mapper argument (closes #92).

- simplified a few tests in test_options.py

Files:

• elixir/trunk/elixir/entity.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -34 +34 @@
 
 __doc_all__ = ['Entity', 'EntityMeta']
+
+
+def session_mapper_factory(scoped_session):
+    def session_mapper(cls, *args, **kwargs):
+        if kwargs.pop('save_on_init', True):
+            old_init = cls.__init__
+            def __init__(self, *args, **kwargs):
+                old_init(self, *args, **kwargs)
+                scoped_session.add(self)
+            cls.__init__ = __init__
+        cls.query = scoped_session.query_property()
+        return mapper(cls, *args, **kwargs)
+    return session_mapper
 
 
@@ -441 +454 @@
             self.entity.mapper = mapper(self.entity, *args, **kwargs)
         elif isinstance(self.session, ScopedSession):
-            self.entity.mapper = self.session.mapper(self.entity,
-                                                     *args, **kwargs)
+            session_mapper = session_mapper_factory(self.session)
+            self.entity.mapper = session_mapper(self.entity, *args, **kwargs)
         else:
             raise Exception("Failed to map entity '%s' with its table or "