Changeset 336

Timestamp:

06/13/08 17:12:38 (5 years ago)

Author:

ged

Message:

update Elixir to work with SA0.5

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (2 diffs)
• elixir/ext/encrypted.py (modified) (2 diffs)
• elixir/ext/versioned.py (modified) (8 diffs)
• elixir/options.py (modified) (1 diff)
• setup.py (modified) (1 diff)
• tests/test_associable.py (modified) (1 diff)
• tests/test_options.py (modified) (1 diff)
• tests/test_sa_integration.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -12 +12 @@
   identity for an entity. It also accepts a callable so that you can generate
   the identity name automatically from the class itself.
+
+Changes:
+- require SQLAlchemy 0.4
 
 Bug fixes:

elixir/trunk/elixir/entity.py

@@ -14 +14 @@
                                           ForeignKeyConstraint
 from sqlalchemy.orm                import Query, MapperExtension, \
-                                          mapper, object_session, EXT_PASS, \
+                                          mapper, object_session, \
+                                          EXT_CONTINUE, \
                                           polymorphic_union
-from sqlalchemy.ext.sessioncontext import SessionContext
+try:
+    from sqlalchemy.ext.sessioncontext import SessionContext
+except ImportError:
+    # Probably on sqlalchemy version 0.5
+    pass
 
 import elixir
@@ -331 +336 @@
                     ret = func(instance)
                     # I couldn't commit myself to force people to 
-                    # systematicaly return EXT_PASS in all their event methods.
+                    # systematicaly return EXT_CONTINUE in all their event 
+                    # methods.
                     # But not doing that diverge to how SQLAlchemy works.
-                    # I should try to convince Mike to do EXT_PASS by default,
-                    # and stop processing as the special case.
-#                    if ret != EXT_PASS:
-                    if ret is not None and ret != EXT_PASS:
+                    # I should try to convince Mike to do EXT_CONTINUE by 
+                    # default, and stop processing as the special case.
+#                    if ret != EXT_CONTINUE:
+                    if ret is not None and ret != EXT_CONTINUE:
                         return ret
-                return EXT_PASS
+                return EXT_CONTINUE
             return proxy_method
 

elixir/trunk/elixir/ext/encrypted.py

@@ -29 +29 @@
 from Crypto.Cipher          import Blowfish 
 from elixir.statements      import Statement
-from sqlalchemy.orm         import MapperExtension, EXT_PASS
+from sqlalchemy.orm         import MapperExtension, EXT_CONTINUE
 
 __all__ = ['acts_as_encrypted']
@@ -73 +73 @@
             def before_insert(self, mapper, connection, instance):
                 perform_encryption(instance)
-                return EXT_PASS
+                return EXT_CONTINUE
             
             def before_update(self, mapper, connection, instance):       
                 perform_encryption(instance)
-                return EXT_PASS
+                return EXT_CONTINUE
             
             def populate_instance(self, mapper, selectcontext, row, instance, 
                                   *args, **kwargs):
+                #FIXME: this is not available anymore in 0.5
+                #<jek> Gedd: on_load will do what you want here.  
+                #the example in test/orm/instrumentation is the most succinct
                 mapper.populate_instance(selectcontext, instance, row, 
                                          *args, **kwargs)

elixir/trunk/elixir/ext/versioned.py

@@ -50 +50 @@
 
 from sqlalchemy            import Table, Column, and_, desc
-from sqlalchemy.orm        import mapper, MapperExtension, EXT_PASS, \
+from sqlalchemy.orm        import mapper, MapperExtension, EXT_CONTINUE, \
                                   object_session
 
@@ -89 +89 @@
         instance.version = 1
         instance.timestamp = datetime.now()
-        return EXT_PASS
+        return EXT_CONTINUE
             
     def before_update(self, mapper, connection, instance):
@@ -100 +100 @@
         # data.
         ignored = instance.__class__.__ignored_fields__
-        for key in instance.c.keys():
+        for key in instance.table.c.keys():
             if key in ignored:
                 continue
@@ -111 +111 @@
                 break
 
-        return EXT_PASS
+        return EXT_CONTINUE
         
     def before_delete(self, mapper, connection, instance):
@@ -117 +117 @@
             get_history_where(instance)
         ))
-        return EXT_PASS
+        return EXT_CONTINUE
 
 
@@ -184 +184 @@
             v = object_session(self).query(Version) \
                                     .filter(get_history_where(self)) \
-                                    .order_by(Version.c.version) \
+                                    .order_by(Version.version) \
                                     .all()
             # history contains all the previous records.
@@ -201 +201 @@
             query = object_session(self).query(Version)
             query = query.filter(and_(get_history_where(self), 
-                                      Version.c.timestamp <= dt))
-            query = query.order_by(desc(Version.c.timestamp)).limit(1)
+                                      Version.timestamp <= dt))
+            query = query.order_by(desc(Version.timestamp)).limit(1)
             return query.first()
         
@@ -231 +231 @@
         def compare_with(self, version):
             differences = {}
-            for column in self.c:
+            for column in self.table.c:
                 if column.name in ('version', 'concurrent_version'):
                     continue

elixir/trunk/elixir/options.py

@@ -31 +31 @@
 |                     | ``multi``. Defaults to ``single``.                    |
 |                     | Note that polymorphic concrete inheritance is         |
-|                     | currently not implemented.                            |
+|                     | currently not implemented. See:                       |
+|                     | http://www.sqlalchemy.org/docs/04/mappers.html        |
+|                     | #advdatamapping_mapper_inheritance for an explanation |
+|                     | of the different kinds of inheritances.               |
 +---------------------+-------------------------------------------------------+
 | ``polymorphic``     | Whether the inheritance should be polymorphic or not. |

elixir/trunk/setup.py

@@ -25 +25 @@
       license = "MIT License",
       install_requires = [
-          "SQLAlchemy >= 0.3.9"
+          "SQLAlchemy >= 0.4.0"
       ],
       packages=find_packages(exclude=['ez_setup', 'tests', 'examples']),

elixir/trunk/tests/test_associable.py

@@ -84 +84 @@
         assert '123 Elm St.' in streets
         
-        people = Person.select_addresses(and_(Address.c.street=='132 Elm St',
-                                              Address.c.city=='Smallville'))
+        people = Person.select_addresses(and_(Address.street=='132 Elm St',
+                                              Address.city=='Smallville'))
         assert len(people) == 0
 

elixir/trunk/tests/test_options.py

@@ -114 +114 @@
 
     def test_session_context(self):
-        from sqlalchemy.ext.sessioncontext import SessionContext
+        try:
+            from sqlalchemy.ext.sessioncontext import SessionContext
+        except ImportError:
+            # we are probably on SQLAlchemy 0.5, no need to test this.
+            return
 
         engine = create_engine('sqlite:///')

elixir/trunk/tests/test_sa_integration.py

@@ -25 +25 @@
             Column('id', Integer, primary_key=True),
             Column('name', String(60)),
-            Column('a_id', Integer, ForeignKey(A.c.id))
+            Column('a_id', Integer, ForeignKey(A.id))
         )
         b_table.create()