Connection: calling query() moved here from Result

reverts bc4bebc

Author: dg

src/Database/Connection.php

@@ -200,7 +200,7 @@ public function beginTransaction(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::beginTransaction');
+		$this->logOperation($this->getConnection()->beginTransaction(...), new SqlLiteral('BEGIN TRANSACTION'));
 	}
 
 
@@ -214,7 +214,7 @@ public function commit(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::commit');
+		$this->logOperation($this->getConnection()->commit(...), new SqlLiteral('COMMIT'));
 	}
 
 
@@ -228,7 +228,7 @@ public function rollBack(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::rollBack');
+		$this->logOperation($this->getConnection()->rollBack(...), new SqlLiteral('ROLLBACK'));
 	}
 
 
@@ -269,15 +269,10 @@ public function transaction(callable $callback): mixed
 	public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')] ...$params): Result
 	{
 		[$this->sql, $params] = $this->preprocess($sql, ...$params);
-		try {
-			$result = new Result($this, $this->sql, $params);
-		} catch (DriverException $e) {
-			Arrays::invoke($this->onQuery, $this, $e);
-			throw $e;
-		}
-
-		Arrays::invoke($this->onQuery, $this, $result);
-		return $result;
+		return $this->logOperation(
+			fn() => $this->connection->query($this->sql, $params),
+			new SqlLiteral($this->sql, $params),
+		);
 	}
 
 
@@ -303,13 +298,31 @@ public function preprocess(string $sql, ...$params): array
 	}
 
 
+	private function logOperation(\Closure $callback, SqlLiteral $query): Result
+	{
+		try {
+			$time = microtime(true);
+			$result = $callback();
+			$time = microtime(true) - $time;
+		} catch (DriverException $e) {
+			$e = $this->convertException($e);
+			Arrays::invoke($this->onQuery, $this, $e);
+			throw $e;
+		}
+
+		$result = new Result($this, $query->getSql(), $query->getParameters(), $result, $time);
+		Arrays::invoke($this->onQuery, $this, $result);
+		return $result;
+	}
+
+
 	public function getLastQueryString(): ?string
 	{
 		return $this->sql;
 	}
 
 
-	public function convertException(DriverException $e): DriverException
+	private function convertException(DriverException $e): DriverException
 	{
 		$class = $this->getDatabaseEngine()->classifyException($e);
 		return $class ? $class::from($e) : $e;

src/Database/Result.php

@@ -18,34 +18,21 @@
  */
 class Result implements \Iterator
 {
-	private ?Drivers\Result $result = null;
 	private Row|false|null $lastRow = null;
 	private int $lastRowKey = -1;
 
 	/** @var Row[] */
 	private array $rows;
-	private float $time;
 	private array $meta;
 
 
 	public function __construct(
 		private readonly Connection $connection,
 		private readonly string $queryString,
 		private readonly array $params,
+		private readonly ?Drivers\Result $result,
+		private float $time,
 	) {
-		$time = microtime(true);
-
-		try {
-			if (str_starts_with($queryString, '::')) {
-				$connection->getConnection()->{substr($queryString, 2)}();
-			} else {
-				$this->result = $connection->getConnection()->query($queryString, $params);
-			}
-		} catch (DriverException $e) {
-			throw $connection->convertException($e);
-		}
-
-		$this->time = microtime(true) - $time;
 	}
 
 

tests/Database.Tracy/panel.html

@@ -7,7 +7,7 @@ <h1 title="sqlite::memory:">Queries: 4, time: %a% ms, foo</h1>
 				<td %a%>%A%</td>
 
 				<td class="nette-DbConnectionPanel-sql nette-DbConnectionPanel-sql-">
-					<pre class="dump">::beginTransaction</pre>
+					<pre class="dump">BEGIN TRANSACTION</pre>
 
 
 						<a class="nette-DbConnectionPanel-source" href="%a%" title="%a%Connection.php:%d%" class="tracy-editor">%a%<b>Connection.php</b>:%d%</a>
@@ -40,7 +40,7 @@ <h1 title="sqlite::memory:">Queries: 4, time: %a% ms, foo</h1>
 				<td %a%>%A%</td>
 
 				<td class="nette-DbConnectionPanel-sql nette-DbConnectionPanel-sql-">
-					<pre class="dump">::commit</pre>
+					<pre class="dump">COMMIT</pre>
 
 
 						<a class="nette-DbConnectionPanel-source" href="%a%" title="%a%Connection.php:%d%" class="tracy-editor">%a%<b>Connection.php</b>:%d%</a>
@@ -59,7 +59,7 @@ <h1 title="sqlite::memory:">Queries: 4, time: %a% ms, foo</h1>
 					<pre class="dump"><strong style="color:blue">SELECT</strong></pre>
 
 
-						<a class="nette-DbConnectionPanel-source" href="%a%" title="%a%Result.php:%d%" class="tracy-editor">%a%<b>Result.php</b>:%d%</a>
+						<a class="nette-DbConnectionPanel-source" href="%a%" title="%a%Connection.php:%d%" class="tracy-editor">%a%<b>Connection.php</b>:%d%</a>
 						<table class="tracy-collapsed nette-DbConnectionPanel-trace">%A%</table>
 				</td>