Doctrine - reworked resolving of connection name to be done only once and work with all DBAL versions.

Author: itsgoingd

Clockwork/DataSource/DBALDataSource.php

@@ -20,10 +20,14 @@ class DBALDataSource extends DataSource implements SQLLogger
 	// DBAL connection
 	protected $connection;
 
+	// DBAL connection name
+	protected $connectionName;
+
 	// Create a new data source instance, takes a DBAL connection instance as an argument
 	public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;
+		$this->connectionName = $this->connection->getDatabase();
 
 		$configuration = $this->connection->getConfiguration();
 		$currentLogger = $configuration->getSQLLogger();
@@ -79,9 +83,7 @@ protected function registerQuery($query)
 			'query'      => $this->createRunnableQuery($query['query'], $query['params'], $query['types']),
 			'bindings'   => $query['params'],
 			'duration'   => (microtime(true) - $query['time']) * 1000,
-			// Resolve connection only on DBAL versions older that 3.0, as resolving connection on newer DBAL always
-			// executes an additional SQL query, effectively doubling the number of executed queries
-			'connection' => class_exists(Doctrine\DBAL\DBALException::class) ? $this->connection->getDatabase() : null,
+			'connection' => $this->connectionName,
 			'time'       => $query['time']
 		];