Merge pull request #200 from robap/master

params not passed from execute to logger

lib/Doctrine/DBAL/Statement.php

@@ -129,6 +129,10 @@ class Statement implements \IteratorAggregate, DriverStatement
      */
     public function execute($params = null)
     {
+        if (is_array($params)) {
+            $this->params = $params;
+        }
+        
         $logger = $this->conn->getConfiguration()->getSQLLogger();
         if ($logger) {
             $logger->startQuery($this->sql, $this->params, $this->types);

tests/Doctrine/Tests/DBAL/StatementTest.php

+<?php
+
+namespace Doctrine\Tests\DBAL;
+
+use Doctrine\DBAL\Statement;
+
+class StatementTest extends \Doctrine\Tests\DbalTestCase
+{
+    /**
+     *
+     * @var \Doctrine\DBAL\Connection 
+     */
+    private $conn;
+    
+    /**
+     *
+     * @var \Doctrine\DBAL\Configuration 
+     */
+    private $configuration;
+    
+    public function setUp()
+    {
+        $pdoStatement = $this->getMock('\PDOStatment', array('execute', 'bindParam', 'bindValue'));
+        $platform = new \Doctrine\Tests\DBAL\Mocks\MockPlatform();
+        $driverConnection = $this->getMock('\Doctrine\DBAL\Driver\Connection');
+        $driverConnection->expects($this->any())
+                ->method('prepare')
+                ->will($this->returnValue($pdoStatement));
+        
+        $driver = $this->getMock('\Doctrine\DBAL\Driver');
+        $constructorArgs = array(
+            array(
+                'platform' => $platform
+            ),
+            $driver
+        );
+        $this->conn = $this->getMock('\Doctrine\DBAL\Connection', array(), $constructorArgs);
+        $this->conn->expects($this->atLeastOnce())
+                ->method('getWrappedConnection')
+                ->will($this->returnValue($driverConnection));
+        
+        $this->configuration = $this->getMock('\Doctrine\DBAL\Configuration');
+        $this->conn->expects($this->any())
+                ->method('getConfiguration')
+                ->will($this->returnValue($this->configuration));
+    }
+    
+    public function testExecuteCallsLoggerStartQueryWithParametersWhenValuesBound()
+    {
+        $name = 'foo';
+        $var = 'bar';
+        $type = \PDO::PARAM_STR;
+        $values = array($name => $var);
+        $types = array($name => $type);
+        $sql = '';
+        
+        $logger = $this->getMock('\Doctrine\DBAL\Logging\SQLLogger');
+        $logger->expects($this->once())
+                ->method('startQuery')
+                ->with($this->equalTo($sql), $this->equalTo($values), $this->equalTo($types));
+        
+        $this->configuration->expects($this->once())
+                ->method('getSQLLogger')
+                ->will($this->returnValue($logger));
+        
+        $statement = new Statement($sql, $this->conn);
+        $statement->bindValue($name, $var, $type);
+        $statement->execute();
+    }
+    
+    public function testExecuteCallsLoggerStartQueryWithParametersWhenParamsPassedToExecute()
+    {
+        $name = 'foo';
+        $var = 'bar';
+        $values = array($name => $var);
+        $types = array();
+        $sql = '';
+        
+        $logger = $this->getMock('\Doctrine\DBAL\Logging\SQLLogger');
+        $logger->expects($this->once())
+                ->method('startQuery')
+                ->with($this->equalTo($sql), $this->equalTo($values), $this->equalTo($types));
+        
+        $this->configuration->expects($this->once())
+                ->method('getSQLLogger')
+                ->will($this->returnValue($logger));
+        
+        $statement = new Statement($sql, $this->conn);
+        $statement->execute($values);
+    }
+}
\ No newline at end of file