Changeset 513

Timestamp:

11/09/09 21:10:55 (4 years ago)

Author:

ged

Message:

- do not leak options_defaults from a subclass into a parent class
- do not initialize useless attributes for base and abstract classes

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (5 diffs)
• elixir/options.py (modified) (1 diff)
• tests/test_abstract.py (modified) (3 diffs)

elixir/trunk/elixir/entity.py

@@ -48 +48 @@
     def __init__(self, entity):
         self.entity = entity
-        # entity.__module__ is not always reliable (eg in mod_python)
-        self.module = sys.modules.get(entity.__module__)
-
-        self.builders = []
-
         self.parent = None
-        #XXX: use entity.__subclasses__ ?
-        self.children = []
 
         bases = []
@@ -73 +66 @@
                     bases.append(base)
         self.bases = bases
-
-        if not is_entity(entity):
+        if not is_entity(entity) or is_abstract_entity(entity):
             return
+
+        # entity.__module__ is not always reliable (eg in mod_python)
+        self.module = sys.modules.get(entity.__module__)
+
+        self.builders = []
+
+        #XXX: use entity.__subclasses__ ?
+        self.children = []
 
         # used for multi-table inheritance
@@ -98 +98 @@
 
         # base class(es) options_defaults
-        base_defaults = {}
-        for base in self.bases:
-            base_defaults.update(getattr(base, 'options_defaults', {}))
+        options_defaults = self.options_defaults()
 
         complete_defaults = options.options_defaults.copy()
@@ -111 +109 @@
         # set default value for other options
         for key in options.valid_options:
-            value = base_defaults.get(key, complete_defaults[key])
+            value = options_defaults.get(key, complete_defaults[key])
             if isinstance(value, dict):
                 value = value.copy()
@@ -121 +119 @@
             if hasattr(self.module, attr):
                 setattr(self, key, getattr(self.module, attr))
+
+    def options_defaults(self):
+        base_defaults = {}
+        for base in self.bases:
+            base_defaults.update(base._descriptor.options_defaults())
+        base_defaults.update(getattr(self.entity, 'options_defaults', {}))
+        return base_defaults
 
     def setup_options(self):

elixir/trunk/elixir/options.py

@@ -242 +242 @@
             raise Exception("'%s' is not a valid option for Elixir entities."
                             % kwarg)
-    if not hasattr(entity, 'options_defaults'):
+
+    # We use __dict__ instead of hasattr to not check its presence within the
+    # parent, and thus update the parent dict instead of creating a local dict.
+    if not entity.__dict__.get('options_defaults'):
         entity.options_defaults = {}
     entity.options_defaults.update(kwargs)

elixir/trunk/tests/test_abstract.py

@@ -33 +33 @@
         class AbstractPerson(Entity):
             using_options(abstract=True)
+            using_options_defaults(tablename=camel_to_underscore)
 
             firstname = Field(String(30))
             lastname = Field(String(30))
 
-        class AbstractEmployed(AbstractPerson):
+        class AbstractEmployee(AbstractPerson):
             using_options(abstract=True)
+            using_options_defaults(identity=camel_to_underscore)
 
             corporation = Field(String(30))
 
-        class Employed(AbstractEmployed):
+        class ConcreteEmployee(AbstractEmployee):
             service = Field(String(30))
 
-        class Citizen(AbstractPerson):
+        class ConcreteCitizen(AbstractPerson):
             country = Field(String(30))
 
@@ -51 +53 @@
 
         assert not hasattr(AbstractPerson, 'table')
-        assert not hasattr(AbstractEmployed, 'table')
-        assert hasattr(Employed, 'table')
-        assert hasattr(Citizen, 'table')
+        assert not hasattr(AbstractEmployee, 'table')
+        assert hasattr(ConcreteEmployee, 'table')
+        assert hasattr(ConcreteCitizen, 'table')
+        assert ConcreteEmployee.table.name == 'concrete_employee'
+        assert ConcreteCitizen.table.name == 'concrete_citizen'
 
-        assert 'firstname' in Employed.table.columns
-        assert 'lastname' in Employed.table.columns
-        assert 'corporation' in Employed.table.columns
-        assert 'service' in Employed.table.columns
+        assert 'firstname' in ConcreteEmployee.table.columns
+        assert 'lastname' in ConcreteEmployee.table.columns
+        assert 'corporation' in ConcreteEmployee.table.columns
+        assert 'service' in ConcreteEmployee.table.columns
 
-        assert 'firstname' in Citizen.table.columns
-        assert 'lastname' in Citizen.table.columns
-        assert 'corporation' not in Citizen.table.columns
-        assert 'country' in Citizen.table.columns
+        assert 'firstname' in ConcreteCitizen.table.columns
+        assert 'lastname' in ConcreteCitizen.table.columns
+        assert 'corporation' not in ConcreteCitizen.table.columns
+        assert 'country' in ConcreteCitizen.table.columns
+        # test that the options_defaults do not leak into the parent base
+        assert ConcreteCitizen._descriptor.identity == 'concretecitizen'
 
     def test_simple_relation(self):
@@ -166 +172 @@
             using_options(inheritance='multi')
 
-        class DatedContact(AbstractDated, Contact):
+        class MixedDatedContact(AbstractDated, Contact):
             using_options(inheritance='multi')
 
         setup_all(True)
 
-        assert 'created_date' in DatedContact.table.columns
-        assert 'modified_date' in DatedContact.table.columns
-        assert DatedContact._descriptor.identity == 'dated_contact'
-        assert DatedContact.table.name == 'dated_contact'
+        assert 'created_date' in MixedDatedContact.table.columns
+        assert 'modified_date' in MixedDatedContact.table.columns
+        assert MixedDatedContact._descriptor.identity == 'mixed_dated_contact'
+        assert MixedDatedContact.table.name == 'mixed_dated_contact'
 
-        contact1 = DatedContact(first_name=u"Guido", last_name=u"van Rossum")
+        contact1 = MixedDatedContact(first_name=u"Guido",
+                                     last_name=u"van Rossum")
         session.commit()
 
+