connection|driver: refactored logging queries from driver [closes #53]

nextras · Jul 22, 2017 · 3ed9bde · 3ed9bde
1 parent 4587ab2
commit 3ed9bde
Show file tree

Hide file tree

Showing 4 changed files with 51 additions and 26 deletions.
diff --git a/src/Connection.php b/src/Connection.php
@@ -69,13 +69,8 @@ public function connect()
 		if ($this->connected) {
 			return;
 		}
-		$this->driver->connect($this->config, function (string $sql, bool $onlyLog = false) {
-			if ($onlyLog) {
-				$this->fireEvent('onQuery', [$this, $sql]);
-				return null;
-			} else {
-				return $this->nativeQuery($sql);
-			}
+		$this->driver->connect($this->config, function (string $sql, float $time, Result $result = null, DriverException $exception = null) {
+			$this->fireEvent('onQuery', [$this, $sql, $time, $result, $exception]);
 		});
 		$this->connected = true;
 		$this->nestedTransactionsWithSavepoint = (bool) ($this->config['nestedTransactionsWithSavepoint'] ?? true);

diff --git a/src/Drivers/Mysqli/MysqliDriver.php b/src/Drivers/Mysqli/MysqliDriver.php
@@ -35,7 +35,7 @@ class MysqliDriver implements IDriver
 	private $connectionTz;
 
 	/** @var callable */
-	private $loggedQueryCallback;
+	private $onQueryCallback;
 
 	/** @var float */
 	private $timeTaken = 0.0;
@@ -47,9 +47,9 @@ public function __destruct()
 	}
 
 
-	public function connect(array $params, callable $loggedQueryCallback)
+	public function connect(array $params, callable $onQueryCallback)
 	{
-		$this->loggedQueryCallback = $loggedQueryCallback;
+		$this->onQueryCallback = $onQueryCallback;
 
 		$host = $params['host'] ?? ini_get('mysqli.default_host');
 		$port = $params['port'] ?? (int) (ini_get('mysqli.default_port') ?: 3306);
@@ -375,6 +375,13 @@ protected function createException($error, $errorNo, $sqlState, $query = null)
 
 	protected function loggedQuery(string $sql)
 	{
-		return ($this->loggedQueryCallback)($sql);
+		try {
+			$result = $this->query($sql);
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), $result, null);
+			return $result;
+		} catch (DriverException $exception) {
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), null, $exception);
+			throw $exception;
+		}
 	}
 }
diff --git a/src/Drivers/Pgsql/PgsqlDriver.php b/src/Drivers/Pgsql/PgsqlDriver.php
@@ -34,7 +34,7 @@ class PgsqlDriver implements IDriver
 	private $connectionTz;
 
 	/** @var callable */
-	private $loggedQueryCallback;
+	private $onQueryCallback;
 
 	/** @var int */
 	private $affectedRows = 0;
@@ -49,14 +49,14 @@ public function __destruct()
 	}
 
 
-	public function connect(array $params, callable $loggedQueryCallback)
+	public function connect(array $params, callable $onQueryCallback)
 	{
 		static $knownKeys = [
 			'host', 'hostaddr', 'port', 'dbname', 'user', 'password',
 			'connect_timeout', 'options', 'sslmode', 'service',
 		];
 
-		$this->loggedQueryCallback = $loggedQueryCallback;
+		$this->onQueryCallback = $onQueryCallback;
 
 		$params = $this->processConfig($params);
 		$connectionString = '';
@@ -372,7 +372,14 @@ protected function createException($error, $errorNo, $sqlState, $query = null)
 
 	protected function loggedQuery(string $sql)
 	{
-		return ($this->loggedQueryCallback)($sql);
+		try {
+			$result = $this->query($sql);
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), $result, null);
+			return $result;
+		} catch (DriverException $exception) {
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), null, $exception);
+			throw $exception;
+		}
 	}
 
 

diff --git a/src/Drivers/Sqlsrv/SqlsrvDriver.php b/src/Drivers/Sqlsrv/SqlsrvDriver.php
@@ -32,7 +32,7 @@ class SqlsrvDriver implements IDriver
 	private $connection;
 
 	/** @var callable */
-	private $loggedQueryCallback;
+	private $onQueryCallback;
 
 	/** @var int */
 	private $affectedRows = 0;
@@ -47,7 +47,7 @@ public function __destruct()
 	}
 
 
-	public function connect(array $params, callable $loggedQueryCallback)
+	public function connect(array $params, callable $onQueryCallback)
 	{
 		// see https://msdn.microsoft.com/en-us/library/ff628167.aspx
 		static $knownConnectionOptions = [
@@ -58,7 +58,7 @@ public function connect(array $params, callable $loggedQueryCallback)
 			'TransactionIsolation', 'TrustServerCertificate', 'WSID'
 		];
 
-		$this->loggedQueryCallback = $loggedQueryCallback;
+		$this->onQueryCallback = $onQueryCallback;
 		$connectionString = isset($params['port']) ? $params['host'] . ',' . $params['port'] : $params['host'];
 
 		$connectionOptions = [];
@@ -187,26 +187,35 @@ public function setTransactionIsolationLevel(int $level)
 
 	public function beginTransaction()
 	{
-		$this->loggedQuery('BEGIN TRANSACTION', true);
-		if (!sqlsrv_begin_transaction($this->connection)) {
+		$time = microtime(true);
+		$result = sqlsrv_begin_transaction($this->connection);
+		$timeTaken = microtime(true) - $time;
+		($this->onQueryCallback)('BEGIN TRANSACTION', $timeTaken, null, null);
+		if (!$result) {
 			$this->throwErrors();
 		}
 	}
 
 
 	public function commitTransaction()
 	{
-		$this->loggedQuery('COMMIT TRANSACTION', true);
-		if (!sqlsrv_commit($this->connection)) {
+		$time = microtime(true);
+		$result = sqlsrv_commit($this->connection);
+		$timeTaken = microtime(true) - $time;
+		($this->onQueryCallback)('COMMIT TRANSACTION', $timeTaken, null, null);
+		if (!$result) {
 			$this->throwErrors();
 		}
 	}
 
 
 	public function rollbackTransaction()
 	{
-		$this->loggedQuery('ROLLBACK TRANSACTION', true);
-		if (!sqlsrv_rollback($this->connection)) {
+		$time = microtime(true);
+		$result = sqlsrv_rollback($this->connection);
+		$timeTaken = microtime(true) - $time;
+		($this->onQueryCallback)('ROLLBACK TRANSACTION', $timeTaken, null, null);
+		if (!$result) {
 			$this->throwErrors();
 		}
 	}
@@ -365,8 +374,15 @@ protected function createException($error, $errorNo, $sqlState, $query = null)
 	}
 
 
-	protected function loggedQuery(string $sql, bool $onlyLog = false): ?Result
+	protected function loggedQuery(string $sql)
 	{
-		return ($this->loggedQueryCallback)($sql, $onlyLog);
+		try {
+			$result = $this->query($sql);
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), $result, null);
+			return $result;
+		} catch (DriverException $exception) {
+			($this->onQueryCallback)($sql, $this->getQueryElapsedTime(), null, $exception);
+			throw $exception;
+		}
 	}
 }