Changeset 480

Timestamp:

09/30/09 14:58:16 (4 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

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (2 diffs)
• tests/test_options.py (modified) (5 diffs)

elixir/trunk/CHANGES

@@ -57 +57 @@
 - Default table_options (defined in options_defaults['table_options']) are now
   also used for ManyToMany tables (closes #94).
+- 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).
 
 Bug fixes:

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 "

elixir/trunk/tests/test_options.py

@@ -117 +117 @@
         class Person(Entity):
             using_options(session=None)
-            firstname = Field(String(30))
-            surname = Field(String(30))
+            name = Field(String(30))
 
         setup_all()
@@ -126 +125 @@
         session = Session()
 
-        homer = Person(firstname="Homer", surname='Simpson')
-        bart = Person(firstname="Bart", surname='Simpson')
+        homer = Person(name="Homer")
+        bart = Person(name="Bart")
 
         session.add(homer)
@@ -136 +135 @@
         session.commit()
 
-        assert session.query(Person).filter_by(firstname='Homer').one() is \
+        assert session.query(Person).filter_by(name='Homer').one() is \
                homer
         assert session.query(Person).count() == 1
@@ -146 +145 @@
         class Person(Entity):
             using_options(session=Session)
-            firstname = Field(String(30))
-            surname = Field(String(30))
+            name = Field(String(30))
 
         setup_all()
         create_all(engine)
 
-        homer = Person(firstname="Homer", surname='Simpson')
-        bart = Person(firstname="Bart", surname='Simpson')
+        homer = Person(name="Homer")
+        bart = Person(name="Bart")
         Session.commit()
 
         assert Person.query.session is Session()
-        assert Person.query.filter_by(firstname='Homer').one() is homer
+        assert Person.query.filter_by(name='Homer').one() is homer
+
+    def test_scoped_session_no_save_on_init(self):
+        metadata.bind = 'sqlite://'
+
+        class Person(Entity):
+            using_mapper_options(save_on_init=False)
+            name = Field(String(30))
+
+        setup_all(True)
+
+        homer = Person(name="Homer")
+        bart = Person(name="Bart")
+        assert homer not in session
+        assert bart not in session
+        session.add(homer)
+        session.add(bart)
+        session.commit()
+
+        assert Person.query.filter_by(name='Homer').one() is homer
 
     def test_global_scoped_session(self):
@@ -167 +184 @@
 
         class Person(Entity):
-            firstname = Field(String(30))
-            surname = Field(String(30))
+            name = Field(String(30))
 
         setup_all()
         create_all(engine)
 
-        homer = Person(firstname="Homer", surname='Simpson')
-        bart = Person(firstname="Bart", surname='Simpson')
+        homer = Person(name="Homer")
+        bart = Person(name="Bart")
         session.commit()
 
         assert Person.query.session is session()
-        assert Person.query.filter_by(firstname='Homer').one() is homer
+        assert Person.query.filter_by(name='Homer').one() is homer
 
         del __session__
+
 
 class TestTableOptions(object):