From 364c293e16c0f5286eee45b286e58d2e9ffa5396 Mon Sep 17 00:00:00 2001
From: Majna <majnaggz@gmail.com>
Date: Sun, 27 May 2012 23:16:20 +0200
Subject: [PATCH] Add test for belongsTo and hasOne optimization.

---
 .../Case/Model/Datasource/DboSourceTest.php   | 56 +++++++++++++++++++
 1 file changed, 56 insertions(+)

diff --git a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
index c74f037df..ad83ca57e 100644
--- a/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
+++ b/lib/Cake/Test/Case/Model/Datasource/DboSourceTest.php
@@ -767,6 +767,62 @@ class DboSourceTest extends CakeTestCase {
 		$this->assertTrue(is_array($result));
 	}
 
+/**
+ * test that queryAssociation() reuse already joined data for 'belongsTo' and 'hasOne' associations
+ * instead of running unneeded queries for each record
+ *
+ * @return void
+ */
+	public function testQueryAssociationUnneededQueries() {
+		$this->loadFixtures('Article', 'User', 'Comment', 'Attachment', 'Tag', 'ArticlesTag');
+		$Comment = new Comment;
+
+		$fullDebug = $this->db->fullDebug;
+		$this->db->fullDebug = true;
+
+		$Comment->find('all', array('recursive' => 2)); // ensure Model descriptions are saved
+		$this->db->getLog();
+
+		// case: Comment  belongsTo User and Article
+		$Comment->unbindModel(array(
+			'hasOne' => array('Attachment')
+		));
+		$Comment->Article->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasMany' => array('Comment'),
+			'hasAndBelongsToMany' => array('Tag')
+		));
+		$Comment->find('all', array('recursive' => 2));
+		$log = $this->db->getLog();
+		$this->assertEquals(1, count($log['log']));
+
+		// case: Comment belongsTo Article, Article belongsTo User
+		$Comment->unbindModel(array(
+			'belongsTo' => array('User'),
+			'hasOne' => array('Attachment')
+		));
+		$Comment->Article->unbindModel(array(
+			'hasMany' => array('Comment'),
+			'hasAndBelongsToMany' => array('Tag'),
+		));
+		$Comment->find('all', array('recursive' => 2));
+		$log = $this->db->getLog();
+		$this->assertEquals(7, count($log['log']));
+
+		// case: Comment hasOne Attachment
+		$Comment->unbindModel(array(
+			'belongsTo' => array('Article', 'User'),
+		));
+		$Comment->Attachment->unbindModel(array(
+			'belongsTo' => array('Comment'),
+		));
+		$Comment->find('all', array('recursive' => 2));
+		$log = $this->db->getLog();
+		$this->assertEquals(1, count($log['log']));
+
+		$this->db->fullDebug = $fullDebug;
+	}
+
 /**
  * test that fields() is using methodCache()
  *