Changeset 324

Timestamp:

11/17/06 18:03:00

Author:

dowski

Message:

Implementation of #80. A custom association path can now be passed to a UnitJoin.

Files:

• trunk/storage/db.py (modified) (2 diffs)
• trunk/storage/storeshelve.py (modified) (1 diff)
• trunk/storage/storesqlite.py (modified) (1 diff)
• trunk/test/zoo_fixture.py (modified) (5 diffs)
• trunk/units.py (modified) (1 diff)

trunk/storage/db.py

@@ -365 +365 @@
-        for wrapperA in classlist1:
-            for wrapperB in classlist2:
-
+
+
-                if ua:
-                    nearTable, farTable = wrapperA, wrapperB
-                    break
-
+
+
-                if ua:
-                    nearTable, farTable = wrapperB, wrapperA
@@ -415 +417 @@
-                else:
-                    seen[cls2] = None
-
+
+
+
+
+
-        classes = wrap(classes)
-        

trunk/storage/storeshelve.py

@@ -191 +191 @@
-            for indexA, clsA in enumerate(classlist1):
-                for indexB, clsB in enumerate(classlist2):
-
+
+
-                    if ua:
-                        nearKey, farKey = ua.nearKey, ua.farKey
-                        break
-
+
+
-                    if ua:
-                        nearKey, farKey = ua.farKey, ua.nearKey

trunk/storage/storesqlite.py

@@ -717 +717 @@
-        for wrapperA in classlist1:
-            for wrapperB in classlist2:
-
+
+
-                if ua:
-                    nearTable, farTable = wrapperA, wrapperB
-                    break
-
+
+
-                if ua:
-                    nearTable, farTable = wrapperB, wrapperA

trunk/test/zoo_fixture.py

@@ -39 +39 @@
-import dejavu
-from dejavu import errors, logic
-
+, UnitAssociation
-from dejavu.test import tools
-from dejavu import engines
@@ -62 +62 @@
-    Age = UnitProperty(float, hints={'precision': 4}, default=1)
-    MotherID = UnitProperty(int)
+    PreferredFoodID = UnitProperty(int)
+    AlternateFoodID = UnitProperty(int)
-
-Animal.many_to_one('ID', Animal, 'MotherID')
@@ -82 +84 @@
-Zoo.one_to_many('ID', Animal, 'ZooID')
-
+class AlternateFoodAssociation(UnitAssociation):
+    to_many = False
+    register = False
+    
+    def related(self, unit, expr=None):
+        food = unit.sandbox.unit(Food, ID=unit.AlternateFoodID)
+        return food
+
+class Food(Unit):
+    """A food item."""
+    Name = UnitProperty()
+    NutritionValue = UnitProperty(int)
+
+Food.one_to_many('ID', Animal, 'PreferredFoodID')
+
+descriptor = AlternateFoodAssociation('AlternateFoodID', Food, 'ID')
+descriptor.nearClass = Animal
+Animal._associations['Alternate Food'] = descriptor
+Animal.AlternateFood = descriptor
+del descriptor
-
-class Vet(Unit):
@@ -282 +304 @@
-            for d in every17days:
-                box.memorize(Visit(VetID=jm.ID, AnimalID=emp.ID, Date=d))
+
+            # Foods
+            dead_fish = Food(Name="Dead Fish", Nutrition=5)
+            live_fish = Food(Name="Live Fish", Nutrition=10)
+            bunnies = Food(Name="Live Bunny Wabbit", Nutrition=10)
+            steak = Food(Name="T-Bone", Nutrition=7)
+            for food in [dead_fish, live_fish, bunnies, steak]:
+                box.memorize(food)
+            
+            # Foods --> add preferred foods
+            lion.add(steak)
+            tiger.add(bunnies)
+            emp.add(live_fish)
+            adelie.add(live_fish)
+            
+            # Foods --> add alternate foods
+            lion.AlternateFoodID = bunnies.ID
+            tiger.AlternateFoodID = steak.ID
+            emp.AlternateFoodID = dead_fish.ID
+            adelie.AlternateFoodID = dead_fish.ID
-            
-        finally:
@@ -623 +665 @@
-            animals = [mother.ID for anim, mother in box.recall(tree, f)]
-            self.assertEqual(animals, [11])
+        finally:
+            box.flush_all()
+            
+    def test_8_CustomAssociations(self):
+        for store in arena.stores.itervalues():
+            if hasattr(store, "sweep_all"):
+                store.sweep_all()
+        
+        box = arena.new_sandbox()
+        try:
+            # Try different association paths
+            std_expected = ['Live Bunny Wabbit', 'Live Fish', 'Live Fish', 'T-Bone']
+            cus_expected = ['Dead Fish', 'Dead Fish', 'Live Bunny Wabbit', 'T-Bone']
+            uj = Animal & Food
+            for path, expected in [# standard path
+                                   (None, std_expected),
+                                   # custom path
+                                   ('Alternate Food', cus_expected)]:
+                
+                uj.path = path
+                results = box.recall(uj)
+                foods = [f for a,f in results]
+                foods.sort(dejavu.sort('Name'))
+                self.assertEqual([f.Name for f in foods], expected)
+
+            # Test the magic association methods
+            tiger = box.unit(Animal, Species='Tiger')
+            self.assertEqual(tiger.Food().Name, 'Live Bunny Wabbit')
+            self.assertEqual(tiger.AlternateFood().Name, 'T-Bone')
+            
-        finally:
-            box.flush_all()

trunk/units.py

@@ -115 +115 @@
-        self.class2 = class2
-        self.leftbiased = leftbiased
+        self.path = None
-        
-        # From http://msdn.microsoft.com/library/en-us/