Passing the query object to drivers to prepare the sql

cakephp · Jan 20, 2014 · 79ff83d · 79ff83d
1 parent d0cb098
commit 79ff83d
Show file tree

Hide file tree

Showing 4 changed files with 10 additions and 9 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -200,9 +200,6 @@ public function isConnected() {
  * @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/Driver.php b/src/Database/Driver.php
@@ -92,10 +92,10 @@ public abstract function enabled();
 /**
  * Prepares a sql statement to be executed
  *
- * @param string $sql
+ * @param string|Cake\Database\Query $query
  * @return Cake\Database\Statement
  */
-	public abstract function prepare($sql);
+	public abstract function prepare($query);
 
 /**
  * Starts a transaction

diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -16,6 +16,7 @@
  */
 namespace Cake\Database\Driver;
 
+use Cake\Database\Query;
 use Cake\Database\Statement\PDOStatement;
 use PDO;
 
@@ -71,11 +72,12 @@ public function disconnect() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string $sql
+ * @param string|Cake\Database\Query $query
  * @return Cake\Database\Statement
  */
-	public function prepare($sql) {
+	public function prepare($query) {
 		$this->connect();
+		$sql = $query instanceof Query ? $query->sql() : $query;
 		$statement = $this->_connection->prepare($sql);
 		return new PDOStatement($statement, $this);
 	}

diff --git a/src/Database/Driver/Sqlite.php b/src/Database/Driver/Sqlite.php
@@ -17,6 +17,7 @@
 namespace Cake\Database\Driver;
 
 use Cake\Database\Dialect\SqliteDialectTrait;
+use Cake\Database\Query;
 use Cake\Database\Statement\PDOStatement;
 use Cake\Database\Statement\SqliteStatement;
 use PDO;
@@ -84,11 +85,12 @@ public function enabled() {
 /**
  * Prepares a sql statement to be executed
  *
- * @param string $sql
+ * @param string|Cake\Database\Query $query
  * @return Cake\Database\Statement
  */
-	public function prepare($sql) {
+	public function prepare($query) {
 		$this->connect();
+		$sql = $query instanceof Query ? $query->sql() : $query;
 		$statement = $this->_connection->prepare($sql);
 		return new SqliteStatement(new PDOStatement($statement, $this), $this);
 	}