Changeset 194

Timestamp:

04/11/07 20:29:59 (2 years ago)

Author:

bermiferrer

Message:

Adding 'unique' support for habtm associations

Files:

• trunk/docs/images/akelos_mvc-es.png (modified) (previous)
• trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (3 diffs)
• trunk/test/unit/lib/AkActiveRecord/AkHasAndBelongsToMany.php (modified) (6 diffs)

trunk/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -483 +483 @@
-                    $record_id = $records[$k];
-                }
-
+
-                foreach (array_keys($this->Owner->{$this->association_id}) as $kk){
-                    if(
@@ -864 +864 @@
-            $class_name = strtolower($CollectionHandler->getOption($association_id, 'class_name'));
-            if(!empty($object->$association_id) && is_array($object->$association_id)){
+                $this->_removeDuplicates($object, $association_id);
-                foreach (array_keys($object->$association_id) as $k){
-                    if(!empty($object->{$association_id}[$k]) && strtolower(get_class($object->{$association_id}[$k])) == $class_name){
@@ -888 +889 @@
-
-    }
+
+    function _removeDuplicates(&$object, $association_id)
+    {
+        if(!empty($object->{$association_id})){
+            $CollectionHandler =& $object->hasAndBelongsToMany->models[$association_id];
+            $options = $CollectionHandler->getOptions($association_id);
+            if(empty($options['unique'])){
+                return ;
+            }
+            if($object->isNewRecord()){
+                $ids = array();
+            }else{
+                if($existing = $CollectionHandler->find()){
+                    $ids = $existing[0]->collect($existing,'id','id');
+                }else{
+                    $ids = array();
+                }
+            }
+            $class_name = strtolower($CollectionHandler->getOption($association_id, 'class_name'));
+            foreach (array_keys($object->$association_id) as $k){
+                if(!empty($object->{$association_id}[$k]) && strtolower(get_class($object->{$association_id}[$k])) == $class_name && !$object->{$association_id}[$k]->isNewRecord()){
+                    $AssociatedItem =& $object->{$association_id}[$k];
+                    if(isset($ids[$AssociatedItem->getId()])){
+                        unset($object->{$association_id}[$k]);
+                        continue;
+                    }
+                    $ids[$AssociatedItem->getId()] = true;
+                }
+            }
+        }
+    }
-}
-

trunk/test/unit/lib/AkActiveRecord/AkHasAndBelongsToMany.php

@@ -228 +228 @@
-    }
-
-
+
-    function test_find_on_unsaved_models_including_associations()
-    {
@@ -252 +252 @@
-    }
-
-
+
-    function test_clean_up_dependencies()
-    {
@@ -276 +276 @@
-    }
-
-
+
-    function test_double_assignation()
-    {
@@ -311 +311 @@
-        $PisoBermi->property_type->add($Atico);
-        $PisoBermi->property_type->add($Apartamento);
-
+
-
-        $this->assertTrue($PisoJose =& $PisoJose->findFirstBy('description','Piso Jose'));
@@ -321 +321 @@
-
-        $this->assertTrue($PisoBermi =& $PisoBermi->findFirstBy('description','Piso Bermi'));
-
+
-        $this->assertTrue($PisoJose =& $PisoJose->findFirstBy('description','Piso Jose'));
-        $PisoJose->property_type->load();
-
+
-        $this->assertTrue($Atico =& $Atico->findFirstBy('description','Ático'));
-        $this->assertTrue($Apartamento =& $Apartamento->findFirstBy('description','Apartamento'));
-
+
-        $this->assertEqual($PisoJose->property_types[0]->getId(), $Apartamento->getId());
-        $this->assertEqual($PisoBermi->property_type->count(), 2);
-
-
-
-
-
-
-
+
+
+
+
+
-    function test_associated_uniqueness()
-    {
@@ -353 +351 @@
-        $this->assertTrue($RanchoMaria =& $Property->findFirstBy('description','Rancho Maria'));
-        $this->assertTrue($Rancho =&  $PropertyType->findFirstBy('description','Rancho', array('include'=>'properties')));
-
+
-        $Rancho->property->add($RanchoMaria);
-        $this->assertEqual($Rancho->property->count(), 1);
-
+        $Rancho->set('description', 'Rancho Type');
+        $this->assertTrue($Rancho->save());
+        $this->assertTrue($Rancho =&  $PropertyType->findFirstBy('description','Rancho Type', array('include'=>'properties')));
+        $this->assertEqual($Rancho->property->count(), 1);
-    }
-