From 9d7c97c2960980b1d0029079de2453ddaf86fde6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Florian=20Kr=E4mer?= <florian.kraemer@cakedc.com>
Date: Tue, 12 Jul 2011 00:54:24 +0200
Subject: [PATCH] Adding the "returnQuery" key to the 2nd argument of the
 find() method to be able to get the query array back from the before state of
 findMethod() calls. This was required in the past for some more complex
 queries and is in 2.0 no longer possible because the find methods became
 protected.

---
 lib/Cake/Model/Model.php                   |  9 +++++--
 lib/Cake/Test/Case/Model/ModelReadTest.php | 28 ++++++++++++++++++++++
 2 files changed, 35 insertions(+), 2 deletions(-)

diff --git a/lib/Cake/Model/Model.php b/lib/Cake/Model/Model.php
index 3d7465cdc8e..53c1c15f8f7 100644
--- a/lib/Cake/Model/Model.php
+++ b/lib/Cake/Model/Model.php
@@ -2102,7 +2102,7 @@ public function hasAny($conditions = null) {
  *  - Otherwise, first and second fields are used for key and value.
  *
  * @param string $type Type of find operation (all / first / count / neighbors / list / threaded)
- * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks)
+ * @param array $query Option fields (conditions / fields / joins / limit / offset / order / page / group / callbacks / returnQuery)
  * @return array Array of records
  * @link http://book.cakephp.org/view/1018/find
  */
@@ -2113,7 +2113,8 @@ public function find($type = 'first', $query = array()) {
 		$query = array_merge(
 			array(
 				'conditions' => null, 'fields' => null, 'joins' => array(), 'limit' => null,
-				'offset' => null, 'order' => null, 'page' => 1, 'group' => null, 'callbacks' => true
+				'offset' => null, 'order' => null, 'page' => 1, 'group' => null, 'callbacks' => true,
+				'returnQuery' => false
 			),
 			(array)$query
 		);
@@ -2156,6 +2157,10 @@ public function find($type = 'first', $query = array()) {
 			}
 		}
 
+		if ($query['returnQuery'] == true) {
+			return $query;
+		}
+
 		$results = $this->getDataSource()->read($this, $query);
 		$this->resetAssociations();
 
diff --git a/lib/Cake/Test/Case/Model/ModelReadTest.php b/lib/Cake/Test/Case/Model/ModelReadTest.php
index f6f17c52833..324a62472d0 100644
--- a/lib/Cake/Test/Case/Model/ModelReadTest.php
+++ b/lib/Cake/Test/Case/Model/ModelReadTest.php
@@ -6010,6 +6010,34 @@ public function testConditionalNumerics() {
 		$this->assertTrue(empty($result));
 	}
 
+/**
+ * test find() with the returnQuery opton in the 2nd argument to get the query array back
+ *
+ * @access public
+ * @return void
+ */
+	public function testFindReturnQuery() {
+		$this->loadFixtures('User');
+		$TestModel = new User();
+		$TestModel->cacheQueries = false;
+
+		$expected = array(
+			'conditions' => array(
+				'user' => 'larry'),
+			'fields' => NULL,
+			'joins' => array (),
+			'limit' => NULL,
+			'offset' => NULL,
+			'order' => array(
+				0 => NULL),
+			'page' => 1,
+			'group' => NULL,
+			'callbacks' => true,
+			'returnQuery' => true);
+		$result = $TestModel->find('all', array('returnQuery' => true, 'conditions' => array('user' => 'larry')));
+		$this->assertEqual($expected, $result);
+	}
+
 /**
  * test find('all') method
  *