Merge pull request #5741 from cakephp/3.0-fix-query-regression

3.0 fix query regression
cakephp · Jan 25, 2015 · 63e5b9e · 63e5b9e
2 parents 75ac510 + 8b153b4
commit 63e5b9e
Show file tree

Hide file tree

Showing 5 changed files with 26 additions and 7 deletions.
diff --git a/src/Database/Driver/Mysql.php b/src/Database/Driver/Mysql.php
@@ -112,9 +112,10 @@ public function enabled()
     public function prepare($query)
     {
         $this->connect();
-        $statement = $this->_connection->prepare((string)$query);
+        $isObject = $query instanceof Query;
+        $statement = $this->_connection->prepare($isObject ? $query->sql() : $query);
         $result = new MysqlStatement($statement, $this);
-        if ($query instanceof Query && $query->bufferResults() === false) {
+        if ($isObject && $query->bufferResults() === false) {
             $result->bufferResults(false);
         }
         return $result;

diff --git a/src/Database/Driver/PDODriverTrait.php b/src/Database/Driver/PDODriverTrait.php
@@ -14,6 +14,7 @@
  */
 namespace Cake\Database\Driver;
 
+use Cake\Database\Query;
 use Cake\Database\Statement\PDOStatement;
 use PDO;
 
@@ -84,7 +85,8 @@ public function disconnect()
     public function prepare($query)
     {
         $this->connect();
-        $statement = $this->_connection->prepare((string)$query);
+        $isObject = $query instanceof Query;
+        $statement = $this->_connection->prepare($isObject ? $query->sql() : $query);
         return new PDOStatement($statement, $this);
     }
 

diff --git a/src/Database/Driver/Sqlite.php b/src/Database/Driver/Sqlite.php
@@ -87,9 +87,10 @@ public function enabled()
     public function prepare($query)
     {
         $this->connect();
-        $statement = $this->_connection->prepare((string)$query);
+        $isObject = $query instanceof Query;
+        $statement = $this->_connection->prepare($isObject ? $query->sql() : $query);
         $result = new SqliteStatement(new PDOStatement($statement, $this), $this);
-        if ($query instanceof Query && $query->bufferResults() === false) {
+        if ($isObject && $query->bufferResults() === false) {
             $result->bufferResults(false);
         }
         return $result;

diff --git a/src/Database/Driver/Sqlserver.php b/src/Database/Driver/Sqlserver.php
@@ -101,10 +101,11 @@ public function prepare($query)
     {
         $this->connect();
         $options = [PDO::ATTR_CURSOR => PDO::CURSOR_SCROLL];
-        if ($query instanceof Query && $query->bufferResults() === false) {
+        $isObject = $query instanceof Query;
+        if ($isObject && $query->bufferResults() === false) {
             $options = [];
         }
-        $statement = $this->_connection->prepare((string)$query, $options);
+        $statement = $this->_connection->prepare($isObject ? $query->sql() : $query);
         return new SqlserverStatement($statement, $this);
     }
 }
diff --git a/tests/TestCase/ORM/QueryRegressionTest.php b/tests/TestCase/ORM/QueryRegressionTest.php
@@ -696,4 +696,18 @@ public function testFindMatchingOverwrite2()
 
         $this->assertNotNull($result->article->author);
     }
+
+
+    /**
+     * Tests that trying to contain an inexistent association
+     * throws an exception and not a fatal error.
+     *
+     * @expectedException InvalidArgumentException
+     * @return void
+     */
+    public function testQueryNotFatalError()
+    {
+        $comments = TableRegistry::get('Comments');
+        $comments->find()->contain('Deprs')->all();
+    }
 }