Connection: calling query() moved here from ResultSet (BC break)

WIP: begin/commit/rollback is not sent to onQuery

Author: dg

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -12,6 +12,7 @@
 use Nette;
 use Nette\Database\Connection;
 use Nette\Database\Helpers;
+use Nette\Database\ResultSet;
 use Tracy;
 
 
@@ -155,7 +156,7 @@ public function getPanel(): ?string
 					$cmd = is_string($this->explain)
 						? $this->explain
 						: 'EXPLAIN';
-					$explain = (new Nette\Database\ResultSet($connection, "$cmd $sql", $params))->fetchAll();
+					$explain = (new ResultSet($connection->getConnectionDriver()->query("$cmd $sql", $params)))->fetchAll();
 				} catch (\PDOException) {
 				}
 			}

src/Database/Connection.php

@@ -146,7 +146,7 @@ public function beginTransaction(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::beginTransaction');
+		$this->getConnectionDriver()->beginTransaction();
 	}
 
 
@@ -156,7 +156,7 @@ public function commit(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::commit');
+		$this->getConnectionDriver()->commit();
 	}
 
 
@@ -166,7 +166,7 @@ public function rollBack(): void
 			throw new \LogicException(__METHOD__ . '() call is forbidden inside a transaction() callback');
 		}
 
-		$this->query('::rollBack');
+		$this->getConnectionDriver()->rollBack();
 	}
 
 
@@ -205,14 +205,17 @@ public function query(#[Language('SQL')] string $sql, #[Language('GenericSQL')]
 	{
 		[$this->sql, $params] = $this->preprocess($sql, ...$params);
 		try {
-			$result = new ResultSet($this, $this->sql, $params, $this->rowNormalizer);
+			$time = microtime(true);
+			$result = $this->connection->query($this->sql, $params);
+			$time = microtime(true) - $time;
+			$resultSet = new ResultSet($result, new SqlLiteral($this->sql, $params), $this->rowNormalizer, $time);
 		} catch (DriverException $e) {
 			Arrays::invoke($this->onQuery, $this, $e);
 			throw $e;
 		}
 
-		Arrays::invoke($this->onQuery, $this, $result);
-		return $result;
+		Arrays::invoke($this->onQuery, $this, $resultSet);
+		return $resultSet;
 	}
 
 

src/Database/ResultSet.php

@@ -17,33 +17,23 @@
  */
 class ResultSet implements \Iterator
 {
-	private readonly ?Drivers\Result $result;
-
 	/** @var callable(array, ResultSet): array */
 	private readonly mixed $normalizer;
 	private Row|false|null $lastRow = null;
 	private int $lastRowKey = -1;
 
 	/** @var Row[] */
 	private array $rows;
-	private float $time;
 	private array $types;
 
 
 	public function __construct(
-		private readonly Connection $connection,
-		private readonly string $queryString,
-		private readonly array $params,
+		private readonly Drivers\Result $result,
+		private readonly ?SqlLiteral $query = null,
 		?callable $normalizer = null,
+		private ?float $time = null,
 	) {
-		$time = microtime(true);
 		$this->normalizer = $normalizer;
-		if (str_starts_with($queryString, '::')) {
-			$connection->getConnectionDriver()->{substr($queryString, 2)}();
-		} else {
-			$this->result = $connection->getConnectionDriver()->query($queryString, $params);
-		}
-		$this->time = microtime(true) - $time;
 	}
 
 
@@ -54,27 +44,27 @@ public function getConnection(): Connection
 	}
 
 
-	public function getQueryString(): string
+	public function getQueryString(): ?string
 	{
-		return $this->queryString;
+		return $this->query?->getSql();
 	}
 
 
 	public function getParameters(): array
 	{
-		return $this->params;
+		return $this->query?->getParameters();
 	}
 
 
 	public function getColumnCount(): ?int
 	{
-		return $this->result?->getColumnCount();
+		return $this->result->getColumnCount();
 	}
 
 
 	public function getRowCount(): ?int
 	{
-		return $this->result?->getRowCount();
+		return $this->result->getRowCount();
 	}
 
 
@@ -149,7 +139,7 @@ public function valid(): bool
 	 */
 	public function fetch(): ?Row
 	{
-		$data = $this->result?->fetch();
+		$data = $this->result->fetch();
 		if ($data === null) {
 			return null;
 
@@ -173,7 +163,7 @@ public function fetch(): ?Row
 	/** @internal */
 	public function fetchAssociative(): ?array
 	{
-		return $this->result?->fetch();
+		return $this->result->fetch();
 	}