Making Connection accepts Query objects

cakephp · Jan 20, 2014 · d0cb098 · d0cb098
1 parent 4c24185
commit d0cb098
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 2 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -196,10 +196,13 @@ public function isConnected() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string $sql
+ * @param string|Cake\Database\Query $sql
  * @return \Cake\Database\Statement
  */
 	public function prepare($sql) {
+		if ($sql instanceof Query) {
+			$sql = $sql->sql();
+		}
 		$statement = $this->_driver->prepare($sql);
 
 		if ($this->_logQueries) {

diff --git a/src/Database/Query.php b/src/Database/Query.php
@@ -201,7 +201,7 @@ public function connection($connection = null) {
  */
 	public function execute() {
 		$query = $this->_transformQuery();
-		$statement = $this->_connection->prepare($query->sql());
+		$statement = $this->_connection->prepare($query);
 		$query->_bindStatement($statement);
 		$statement->execute();