Changeset 340

Timestamp:

06/17/08 17:36:07 (5 years ago)

Author:

ged

Message:

fix encrypted extension on SA0.5

Files:

• elixir/trunk/elixir/ext/encrypted.py (modified) (2 diffs)

elixir/trunk/elixir/ext/encrypted.py

@@ -48 +48 @@
 
 
+try:
+    from sqlalchemy.orm import EXT_PASS
+    SA05orlater = False
+except ImportError:
+    SA05orlater = True
+
 #
 # acts_as_encrypted statement
@@ -78 +84 @@
                 perform_encryption(instance)
                 return EXT_CONTINUE
-            
+        
+        if SA05orlater:
+            def on_reconstitute(self, mapper, instance):
+                perform_decryption(instance)
+                return True
+            EncryptedMapperExtension.on_reconstitute = on_reconstitute
+        else:
             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)
                 perform_decryption(instance)
                 return True
+            EncryptedMapperExtension.populate_instance = populate_instance
         
         # make sure that the entity's mapper has our mapper extension