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

Timestamp:

11/14/07 10:57:14 (6 years ago)

Author:

ged

Message:

• cleanup class attributes (in the attributes-based syntax) after the
  property is attached to its entity, so that SQLAlchemy is not confused.
  Only caused problem in the case of single inheritance and when omitting
  some values. See SA ticket #866.
  
• some PEP8 fixes
  

Files:

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

elixir/trunk/elixir/entity.py

@@ -33 +33 @@
     # Not on sqlalchemy version 0.4
     ScopedSession = type(None)
-    
+
+
 def _do_mapping(session, cls, *args, **kwargs):
     if session is None:
@@ -51 +52 @@
             def __getattr__(s, key):
                 return getattr(session.registry().query(cls), key)
+
             def __call__(s):
                 return session.registry().query(cls)
@@ -252 +254 @@
                 return
             elif self.inheritance == 'concrete':
-               # copy all columns from parent table
-               for col in self.parent._descriptor.columns:
+                # copy all columns from parent table
+                for col in self.parent._descriptor.columns:
                     self.add_column(col.copy())
-               #FIXME: copy constraints. But those are not as simple to copy
-               #since the source column must be changed
+                #FIXME: copy constraints. But those are not as simple to copy
+                #since the source column must be changed
 
         if self.polymorphic and self.inheritance in ('single', 'multi') and \
@@ -524 +526 @@
 
     def columns(self):
-        #FIXME: this would be more correct but it breaks inheritance, so I'll use the
-        # old test for now.
+        #FIXME: this would be more correct but it breaks inheritance, so I'll 
+        # use the old test for now.
 #        if self.entity.table:
         if self.autoload: 
@@ -567 +569 @@
         return "<TriggerProxy (%s)>" % (self.class_.__name__)
 
+
 class TriggerAttribute(object):
+
     def __init__(self, attrname):
         self.attrname = attrname
@@ -581 +585 @@
 def _is_entity(class_):
     return isinstance(class_, EntityMeta)
+
 
 class EntityMeta(type):
@@ -733 +738 @@
             method()
 
+
 def cleanup_entities(entities):
     """