Changeset 422

Timestamp:

12/04/08 17:11:53 (3 years ago)

Author:

ged

Message:

delete Elixir properties as late as possible (ie in setup phase), not right
after they are added. It makes for a less confusing behavior.

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (1 diff)
• elixir/properties.py (modified) (1 diff)
• tests/test_properties.py (modified) (1 diff)

elixir/trunk/elixir/entity.py

@@ -841 +841 @@
 
     for entity in entities:
+        # delete all Elixir properties so that it doesn't interfere with
+        # SQLAlchemy. At this point they should have be converted to
+        # builders.
+        for name, attr in entity.__dict__.items():
+            if isinstance(attr, Property):
+                delattr(entity, name)
+
         if entity._descriptor.autosetup:
             _cleanup_autosetup_triggers(entity)

elixir/trunk/elixir/properties.py

@@ -127 +127 @@
         entity._descriptor.builders.append(self)
 
-        # delete the original attribute so that it doesn't interfere with
-        # SQLAlchemy. Note that getattr and delattr are not symmetrical:
-        # getattr look up in parent classes, while delattr must be called on
-        # the exact class holding the attribute.
-        if name in entity.__dict__:
-            delattr(entity, name)
-
     def __repr__(self):
         return "Property(%s, %s)" % (self.name, self.entity)

elixir/trunk/tests/test_properties.py

@@ -14 +14 @@
     def teardown(self):
         cleanup_all(True)
+
+    def test_lifecycle(self):
+        class A(Entity):
+            name = Field(String(20))
+
+        assert isinstance(A.name, Field)
+
+        setup_all()
+
+        assert not isinstance(A.name, Field)
 
     def test_generic_property(self):