Changeset 510

Timestamp:

11/09/09 12:56:31 (4 years ago)

Author:

ged

Message:

- Fixed having relationships in custom base classes (based on patch

by Stéphane Klein)

Location:

elixir/trunk

Files:

• CHANGES (modified) (1 diff)
• elixir/entity.py (modified) (2 diffs)
• tests/test_custombase.py (modified) (1 diff)

elixir/trunk/CHANGES

@@ -12 +12 @@
 - Fixed custom base classes and versioned extension when used with zope
   interfaces (closes #98, patch from Valentin Lab)
+- Fixed having relationships in custom base classes (based on patch
+  by Stéphane Klein)
 
 0.7.0 - 2009-10-01

elixir/trunk/elixir/entity.py

@@ -8 +8 @@
 import warnings
 
-from copy import copy
+from copy import deepcopy
 
 import sqlalchemy
@@ -718 +718 @@
         base_props = getmembers(entity_base,
                                 lambda a: isinstance(a, Property))
-        base_props = [(name, copy(attr)) for name, attr in base_props]
+        base_props = [(name, deepcopy(attr)) for name, attr in base_props]
     else:
         base_props = []

elixir/trunk/tests/test_custombase.py

@@ -116 +116 @@
         assert 'common' in B.table.columns
 
+    def test_base_with_relation(self):
+        class FieldBase(object):
+            __metaclass__ = EntityMeta
+
+            common = ManyToOne('A')
+
+        class A(FieldBase):
+            name = Field(String(32))
+
+        class B(FieldBase):
+            pass
+
+        setup_all(True)
+
+        assert 'name' in A.table.columns
+        assert 'common_id' in A.table.columns
+        assert 'common_id' in B.table.columns
+
     def test_base_with_fields_in_parent(self):
         class BaseParent(object):