Changeset 432 for elixir/trunk

Timestamp:

12/17/08 13:45:49 (3 years ago)

Author:

ged

Message:

- added test for the with_polymorphic mapper argument (closes #79).
- made manually defined mapper options take precedence over Elixir-generated

ones. Not very useful yet since most are expecting Column objects.

- we do not specify inherit_condition at all anymore since SA apparently

computes it correctly now, at least in 0.4.8+

- added doctrings on EntityBase's get_by and get methods

Location:

elixir/trunk

Files:

• elixir/entity.py (modified) (8 diffs)
• tests/test_inherit.py (modified) (2 diffs)

elixir/trunk/elixir/entity.py

@@ -234 +234 @@
                     # they are added to the parent's table (whether the
                     # parent's table is already setup or not).
-                    for col in self.columns:
+                    for col in self._columns:
                         self.parent._descriptor.add_column(col)
                     for constraint in self.constraints:
@@ -367 +367 @@
         # sqlalchemy/test/orm/inheritance/concrete.py
         # this should be added along other
-        kwargs = self.mapper_options
+        kwargs = {}
         if self.order_by:
             kwargs['order_by'] = self.translate_order_by(self.order_by)
@@ -379 +379 @@
                 # non-polymorphic concrete doesn't need this
                 kwargs['inherits'] = self.parent.mapper
-
-            if self.inheritance == 'multi' and self.parent:
-                col_pairs = zip(self.primary_keys,
-                                self.parent._descriptor.primary_keys)
-                kwargs['inherit_condition'] = \
-                    and_(*[pc == c for c, pc in col_pairs])
 
             if self.polymorphic:
@@ -409 +403 @@
                             self.get_column(self.polymorphic)
 
-                    #TODO: this is an optimization, and it breaks the multi
-                    # table polymorphic inheritance test with a relation.
-                    # So I turn it off for now. We might want to provide an
-                    # option to turn it on.
-#                    if self.inheritance == 'multi':
-#                        children = self._get_children()
-#                        join = self.entity.table
-#                        for child in children:
-#                            join = join.outerjoin(child.table)
-#                        kwargs['select_table'] = join
-
                 if self.children or self.parent:
                     kwargs['polymorphic_identity'] = self.identity
@@ -425 +408 @@
                 if self.parent and self.inheritance == 'concrete':
                     kwargs['concrete'] = True
+
+        if self.parent and self.inheritance == 'single':
+            args = []
+        else:
+            args = [self.entity.table]
+
+        # let user-defined kwargs override Elixir-generated ones, though that's
+        # not very usefull since most of them expect Column instances.
+        kwargs.update(self.mapper_options)
 
         #TODO: document this!
@@ -431 +423 @@
             kwargs['primary_key'] = [getattr(cols, colname) for
                 colname in kwargs['primary_key']]
-
-        if self.parent and self.inheritance == 'single':
-            args = []
-        else:
-            args = [self.entity.table]
 
         # do the mapping
@@ -596 +583 @@
 
     def columns(self):
-        #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:
+        if self.entity.table:
             return self.entity.table.columns
         else:
@@ -1089 +1073 @@
     # query methods
     def get_by(cls, *args, **kwargs):
+        """
+        Returns the first instance of this class matching the given criteria.
+        This is equivalent to:
+        session.query(MyClass).filter_by(...).first()
+        """
         return cls.query.filter_by(*args, **kwargs).first()
     get_by = classmethod(get_by)
 
     def get(cls, *args, **kwargs):
+        """
+        Return the instance of this class based on the given identifier,
+        or None if not found. This is equivalent to:
+        session.query(MyClass).get(...)
+        """
         return cls.query.get(*args, **kwargs)
     get = classmethod(get)

elixir/trunk/tests/test_inherit.py

@@ -129 +129 @@
 
     def test_inverse_matching_on_parent(self):
-        options_defaults['inheritance'] = 'multi'
-
         class Person(Entity):
             using_options(inheritance='multi')
-
             name = Field(UnicodeText)
 
@@ -143 +140 @@
         class Child(Person):
             using_options(inheritance='multi')
-
             parents = ManyToMany('Parent', tablename='child_parent',
                                  inverse='childs')
 
         setup_all()
+
+    def test_multitable_polymorphic_load(self):
+        class A(Entity):
+            using_options(inheritance='multi')
+            # we want to load children's specific data along the parent (A)
+            # data when querying the parent. If we don't specify this, the
+            # children data is loaded lazily
+            using_mapper_options(with_polymorphic='*')
+            name = Field(String(50))
+
+        class B(A):
+            using_options(inheritance='multi')
+            data = Field(String(50))
+            some_c = ManyToOne('C')
+
+        class C(A):
+            using_options(inheritance='multi')
+
+            data = Field(String(50))
+            many_b = OneToMany('B')
+        setup_all(True)
+        a1 = A(name='a1')
+        c1 = C(name='c1', data="c")
+        b1 = B(name='b1', data="b", some_c=c1)
+
+        session.commit()
+        session.clear()
+
+        for a in A.query.all():
+            if isinstance(a, (B, C)):
+                assert 'data' in a.__dict__
 
     def test_singletable_inheritance(self):