Query transformation should happen after beforeFind is triggered

cakephp · Nov 9, 2014 · 33595f3 · 33595f3
1 parent 2a9dd22
commit 33595f3
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/src/ORM/Query.php b/src/ORM/Query.php
@@ -607,15 +607,15 @@ public function all() {
  * {@inheritDoc}
  */
 	public function sql(ValueBinder $binder = null) {
-		$this->_transformQuery();
-
 		if (!$this->_beforeFindFired && $this->_type === 'select') {
 			$table = $this->repository();
 			$table->dispatchEvent('Model.beforeFind', [$this, $this->_options, !$this->eagerLoaded()]);
 			$this->_beforeFindFired = true;
 		}
 
-		return parent::sql($binder);
+		$this->_transformQuery();
+		$sql = parent::sql($binder);
+		return $sql;
 	}
 
 /**