Changeset 141 for elixir/trunk/elixir/relationships.py

Timestamp:

07/04/07 14:36:56 (6 years ago)

Author:

ged

Message:

- cleaned up "match_type_of" is relationship: now each relationship do it

itself, instead of having one generic method. I wonder how I didn't think
of this earlier...

Files:

• elixir/trunk/elixir/relationships.py (modified) (5 diffs)

elixir/trunk/elixir/relationships.py

@@ -312 +312 @@
     
     def match_type_of(self, other):
-        t1, t2 = type(self), type(other)
-    
-        if t1 is HasAndBelongsToMany:
-            return t1 is t2
-        elif t1 in (HasOne, HasMany):
-            return t2 is BelongsTo
-        elif t1 is BelongsTo:
-            return t2 in (HasMany, HasOne)
-        else:
-            return False
+        return False
 
     def is_inverse(self, other):
@@ -357 +348 @@
         super(BelongsTo, self).__init__(entity, name, *args, **kwargs)
     
+    def match_type_of(self, other):
+        return isinstance(other, (HasMany, HasOne))
+
     def create_keys(self):
         '''
@@ -448 +442 @@
         if self.primaryjoin_clauses:
             kwargs['primaryjoin'] = and_(*self.primaryjoin_clauses)
+
         kwargs['uselist'] = False
-        
+
         self.property = relation(self.target, **kwargs)
         self.entity.mapper.add_property(self.name, self.property)
@@ -456 +451 @@
 class HasOne(Relationship):
     uselist = False
+
+    def match_type_of(self, other):
+        return isinstance(other, BelongsTo)
 
     def create_keys(self):
@@ -522 +520 @@
         super(HasAndBelongsToMany, self).__init__(entity, name, 
                                                   *args, **kwargs)
+
+    def match_type_of(self, other):
+        return isinstance(other, HasAndBelongsToMany)
 
     def create_tables(self):