bug #49079 [DoctrineBridge] fix issue with missing stopwatch events (dmaicher)

fabpot · fabpot · commit ce84991461d6 · 2023-04-05T07:19:49.000+02:00
This PR was squashed before being merged into the 5.4 branch. Discussion ---------- [DoctrineBridge] fix issue with missing stopwatch events | Q | A | ------------- | --- | Branch? | 5.4 | Bug fix? | yes | New feature? | no | Deprecations? | no | Tickets | Fix doctrine/DoctrineBundle#1622 | License | MIT | Doc PR | symfony/symfony-docs#...   This fixes doctrine/DoctrineBundle#1622 We were not triggering the stopwatch events/sections properly when using prepared statements. Now it works: ![image](https://user-images.githubusercontent.com/921145/214097708-2986e3c9-262e-4b7e-903e-9b7e0dda208e.png) ![image](https://user-images.githubusercontent.com/921145/214097936-67948cb3-63ad-4eff-b53e-f8ff9e12a7f0.png) Commits ------- 52f4f7b [DoctrineBridge] fix issue with missing stopwatch events
diff --git a/src/Symfony/Bridge/Doctrine/Middleware/Debug/Connection.php b/src/Symfony/Bridge/Doctrine/Middleware/Debug/Connection.php
@@ -44,7 +44,8 @@ public function prepare(string $sql): DriverStatement
             parent::prepare($sql),
             $this->debugDataHolder,
             $this->connectionName,
-            $sql
+            $sql,
+            $this->stopwatch,
         );
     }
 
diff --git a/src/Symfony/Bridge/Doctrine/Middleware/Debug/Statement.php b/src/Symfony/Bridge/Doctrine/Middleware/Debug/Statement.php
@@ -15,6 +15,7 @@
 use Doctrine\DBAL\Driver\Result as ResultInterface;
 use Doctrine\DBAL\Driver\Statement as StatementInterface;
 use Doctrine\DBAL\ParameterType;
+use Symfony\Component\Stopwatch\Stopwatch;
 
 /**
  * @author Laurent VOULLEMIER <laurent.voullemier@gmail.com>
@@ -26,14 +27,16 @@ final class Statement extends AbstractStatementMiddleware
     private $debugDataHolder;
     private $connectionName;
     private $query;
+    private $stopwatch;
 
-    public function __construct(StatementInterface $statement, DebugDataHolder $debugDataHolder, string $connectionName, string $sql)
+    public function __construct(StatementInterface $statement, DebugDataHolder $debugDataHolder, string $connectionName, string $sql, Stopwatch $stopwatch = null)
     {
         parent::__construct($statement);
 
         $this->debugDataHolder = $debugDataHolder;
         $this->connectionName = $connectionName;
         $this->query = new Query($sql);
+        $this->stopwatch = $stopwatch;
     }
 
     public function bindParam($param, &$variable, $type = ParameterType::STRING, $length = null): bool
@@ -59,12 +62,20 @@ public function execute($params = null): ResultInterface
         // clone to prevent variables by reference to change
         $this->debugDataHolder->addQuery($this->connectionName, $query = clone $this->query);
 
+        if ($this->stopwatch) {
+            $this->stopwatch->start('doctrine', 'doctrine');
+        }
+
         $query->start();
 
         try {
             $result = parent::execute($params);
         } finally {
             $query->stop();
+
+            if ($this->stopwatch) {
+                $this->stopwatch->stop('doctrine');
+            }
         }
 
         return $result;
diff --git a/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php b/src/Symfony/Bridge/Doctrine/Tests/Middleware/Debug/MiddlewareTest.php
@@ -161,10 +161,6 @@ public function testWithParamBound(callable $executeMethod)
         $executeMethod($stmt);
 
         // Debug data should not be affected by these changes
-        $product = 'product2';
-        $price = 13.5;
-        $stock = 4;
-
         $debug = $this->debugDataHolder->getData()['default'] ?? [];
         $this->assertCount(2, $debug);
         $this->assertSame('INSERT INTO products(name, price, stock) VALUES (?, ?, ?)', $debug[1]['sql']);
@@ -242,6 +238,14 @@ static function (Connection $conn): bool {
                     return $conn->rollBack();
                 },
             ],
+            'prepared statement' => [
+                static function (Connection $conn, string $sql): Result {
+                    return $conn->prepare($sql)->executeQuery();
+                },
+                static function (Connection $conn): bool {
+                    return $conn->commit();
+                },
+            ],
         ];
     }
 

Original file line number	Diff line number	Diff line change
`@@ -44,7 +44,8 @@ public function prepare(string $sql): DriverStatement`
`44`	`44`	`parent::prepare($sql),`
`45`	`45`	`$this->debugDataHolder,`
`46`	`46`	`$this->connectionName,`
`47`		`- $sql`
	`47`	`+ $sql,`
	`48`	`+ $this->stopwatch,`
`48`	`49`	`);`
`49`	`50`	`}`
`50`	`51`