Adding tests for deletion of multiple habtm associations. Reverting c…

…hanges made in [15518b8] that caused incorrect removal of links when deleting records.  Fixes #247

cake/libs/model/model.php

@@ -1868,18 +1868,15 @@ function _deleteDependent($id, $cascade) {
  */
 	function _deleteLinks($id) {
 		foreach ($this->hasAndBelongsToMany as $assoc => $data) {
-			$with = $data['with'];
-			$records = $this->{$data['with']}->find('all', array(
-				'conditions' => array_merge(array(
-					$this->{$with}->escapeField($data['foreignKey']) => $id
-				)),
-				'fields' => $this->{$with}->primaryKey,
+			$joinModel = $data['with'];
+			$records = $this->{$joinModel}->find('all', array(
+				'conditions' => array_merge(array($this->{$joinModel}->escapeField($data['foreignKey']) => $id)),
+				'fields' => $this->{$joinModel}->primaryKey,
 				'recursive' => -1
 			));
 			if (!empty($records)) {
 				foreach ($records as $record) {
-					$id = $record[$this->{$with}->alias][$this->{$with}->primaryKey];
-					$this->{$with}->delete($id);
+					$this->{$joinModel}->delete($record[$this->{$joinModel}->alias][$this->{$joinModel}->primaryKey]);
 				}
 			}
 		}

cake/tests/cases/libs/model/model_delete.test.php

@@ -500,6 +500,41 @@ function testDeleteLinks() {
 		$this->assertTrue($result, 'deleteAll returned false when all no records matched conditions. %s');
 	}
 
+/**
+ * test deleteLinks with Multiple habtm associations
+ *
+ * @return void
+ */
+	function testDeleteLinksWithMultipleHabtmAssociations() {
+		$this->loadFixtures('JoinA', 'JoinB', 'JoinC', 'JoinAB', 'JoinAC');
+		$JoinA =& new JoinA();
+
+		//create two new join records to expose the issue.
+		$JoinA->JoinAsJoinC->create(array(
+			'join_a_id' => 1,
+			'join_c_id' => 2,
+		));
+		$JoinA->JoinAsJoinC->save();
+		$JoinA->JoinAsJoinB->create(array(
+			'join_a_id' => 1,
+			'join_b_id' => 2,
+		));
+		$JoinA->JoinAsJoinB->save();
+
+		$result = $JoinA->delete(1);
+		$this->assertTrue($result, 'Delete failed %s');
+
+		$joinedBs = $JoinA->JoinAsJoinB->find('count', array(
+			'conditions' => array('JoinAsJoinB.join_a_id' => 1)
+		));
+		$this->assertEqual($joinedBs, 0, 'JoinA/JoinB link records left over. %s');
+
+		$joinedBs = $JoinA->JoinAsJoinC->find('count', array(
+			'conditions' => array('JoinAsJoinC.join_a_id' => 1)
+		));
+		$this->assertEqual($joinedBs, 0, 'JoinA/JoinC link records left over. %s');
+	}
+
 /**
  * testHabtmDeleteLinksWhenNoPrimaryKeyInJoinTable method
  *