Changeset 348

Timestamp:

06/20/08 14:09:41 (5 years ago)

Author:

ged

Message:

First stab at making fields in base class work (see ticket #15).
Needs some cleanup.

Location:

elixir/trunk/elixir

Files:

• entity.py (modified) (5 diffs)
• properties.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -7 +7 @@
 
 import sys
+import inspect
 import warnings
+from copy import copy
 
 import sqlalchemy
@@ -84 +86 @@
 
         self.parent = None
+        #XXX: use entity.__subclasses__ ?
         self.children = []
 
@@ -99 +102 @@
         self._columns = list()
         self.constraints = list()
+
         # properties waiting for a mapper to exist
         self.properties = dict()
@@ -661 +665 @@
     return False
 
+
 class EntityMeta(type):
     """
@@ -684 +689 @@
                                    if isinstance(attr, Property)]
         sorted_props = sorted(properties, key=lambda i: i[1]._counter)
-
         for name, prop in sorted_props:
             prop.attach(cls, name)
+
+        entity_base = None
+        for base in bases:
+            if isinstance(base, EntityMeta):
+                if not is_entity(base):
+                    entity_base = base
+        if entity_base:
+            # Process attributes (using the assignment syntax), looking for
+            # 'Property' instances and attaching them to this entity.
+            base_props = inspect.getmembers(entity_base,
+                                            lambda a: isinstance(a, Property))
+            local_props = [(name, copy(attr)) for name, attr in base_props]
+            sorted_props = sorted(local_props, key=lambda i: i[1]._counter)
+            for name, prop in sorted_props:
+                prop.attach(cls, name)
 
         # Process mutators. Needed before _install_autosetup_triggers so that

elixir/trunk/elixir/properties.py

@@ -116 +116 @@
         # delete the original attribute so that it doesn't interfere with
         # SQLAlchemy.
-        if hasattr(entity, name):
+        if name in entity.__dict__:
             delattr(entity, name)