added Connection::getLastQueryString()

Author: dg

src/Database/Connection.php

@@ -42,6 +42,9 @@ class Connection
 	/** @var PDO */
 	private $pdo;
 
+	/** @var string|null */
+	private $sql;
+
 
 	public function __construct(string $dsn, string $user = null, string $password = null, array $options = null)
 	{
@@ -154,9 +157,9 @@ public function rollBack(): void
 	 */
 	public function query(string $sql, ...$params): ResultSet
 	{
-		[$sql, $params] = $this->preprocess($sql, ...$params);
+		[$this->sql, $params] = $this->preprocess($sql, ...$params);
 		try {
-			$result = new ResultSet($this, $sql, $params);
+			$result = new ResultSet($this, $this->sql, $params);
 		} catch (PDOException $e) {
 			$this->onQuery($this, $e);
 			throw $e;
@@ -184,6 +187,12 @@ public function preprocess(string $sql, ...$params): array
 	}
 
 
+	public function getLastQueryString(): ?string
+	{
+		return $this->sql;
+	}
+
+
 	/********************* shortcuts ****************d*g**/
 
 

tests/Database/Connection.query.phpt

@@ -19,6 +19,7 @@ test(function () use ($connection) {
 	Assert::type(Nette\Database\ResultSet::class, $res);
 	Assert::same('SELECT id FROM author WHERE id = ?', $res->getQueryString());
 	Assert::same([11], $res->getParameters());
+	Assert::same('SELECT id FROM author WHERE id = ?', $connection->getLastQueryString());
 });