some others methods moved to PdoDriver

nette · kratkyzobak · May 10, 2024 · May 10, 2024 · May 13, 2024 · May 10, 2024
commit ccece35e50995cbf55fe50f476e2d343bedd70e0
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -11,8 +11,6 @@
 
 use JetBrains\PhpStorm\Language;
 use Nette\Utils\Arrays;
-use PDO;
-use PDOException;
 
 
 /**
@@ -91,7 +89,7 @@ public function getDsn(): string
 
 
 	/** deprecated use getDriver()->getPdo() */
-	public function getPdo(): PDO
+	public function getPdo(): \PDO
 	{
 		$this->connect();
 		return $this->driver->getPdo();
@@ -129,22 +127,15 @@ public function setRowNormalizer(?callable $normalizer): static
 
 	public function getInsertId(?string $sequence = null): string
 	{
-		try {
-			$res = $this->getPdo()->lastInsertId($sequence);
-			return $res === false ? '0' : $res;
-		} catch (PDOException $e) {
-			throw $this->driver->convertException($e);
-		}
+		$this->connect();
+		return $this->driver->getInsertId($sequence);
 	}
 
 
-	public function quote(string $string, int $type = PDO::PARAM_STR): string
+	public function quote(string $string): string
 	{
-		try {
-			return $this->getPdo()->quote($string, $type);
-		} catch (PDOException $e) {
-			throw DriverException::from($e);
-		}
+		$this->connect();
+		return $this->driver->quote($string);
 	}
 
 
@@ -214,7 +205,7 @@ 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);
-		} catch (PDOException $e) {
+		} catch (\PDOException $e) {
 			Arrays::invoke($this->onQuery, $this, $e);
 			throw $e;
 		}

diff --git a/src/Database/Driver.php b/src/Database/Driver.php
@@ -34,8 +34,26 @@ function connect(string $dsn, ?string $user = null, ?string $password = null, ?a
 	 */
 	function convertException(\PDOException $e): DriverException;
 
+	function query(string $queryString, array $params);
+
+	function beginTransaction(): void;
+
+	function commit(): void;
+
+	function rollBack(): void;
+
+	/**
+	 * Returns the ID of the last inserted row or sequence value.
+	 */
+	function getInsertId(?string $sequence = null): string;
+
+	/**
+	 * Delimits string for use in SQL statement.
+	 */
+	function quote(string $string): string;
+
 	/**
-	 * Delimites identifier for use in a SQL statement.
+	 * Delimits identifier for use in SQL statement.
 	 */
 	function delimite(string $name): string;
 

diff --git a/src/Database/Drivers/PdoDriver.php b/src/Database/Drivers/PdoDriver.php
@@ -10,6 +10,7 @@
 namespace Nette\Database\Drivers;
 
 use Nette;
+use Nette\Database\DriverException;
 use PDO;
 use PDOException;
 
@@ -43,4 +44,79 @@ public function getPdo(): ?PDO
 	{
 		return $this->pdo;
 	}
+
+
+	public function query(string $queryString, array $params)
+	{
+		try {
+			$types = ['boolean' => PDO::PARAM_BOOL, 'integer' => PDO::PARAM_INT, 'resource' => PDO::PARAM_LOB, 'NULL' => PDO::PARAM_NULL];
+
+			$statement = $this->pdo->prepare($queryString);
+			foreach ($params as $key => $value) {
+				$type = gettype($value);
+				$statement->bindValue(is_int($key) ? $key + 1 : $key, $value, $types[$type] ?? PDO::PARAM_STR);
+			}
+
+			$statement->setFetchMode(PDO::FETCH_ASSOC);
+			@$statement->execute(); // @ PHP generates warning when ATTR_ERRMODE = ERRMODE_EXCEPTION bug #73878
+			return $statement;
+
+		} catch (PDOException $e) {
+			$e = $this->convertException($e);
+			$e->queryString = $queryString;
+			$e->params = $params;
+			throw $e;
+		}
+	}
+
+
+	public function beginTransaction(): void
+	{
+		try {
+			$this->pdo->beginTransaction();
+		} catch (PDOException $e) {
+			throw $this->convertException($e);
+		}
+	}
+
+
+	public function commit(): void
+	{
+		try {
+			$this->pdo->commit();
+		} catch (PDOException $e) {
+			throw $this->convertException($e);
+		}
+	}
+
+
+	public function rollBack(): void
+	{
+		try {
+			$this->pdo->rollBack();
+		} catch (PDOException $e) {
+			throw $this->convertException($e);
+		}
+	}
+
+
+	public function getInsertId(?string $sequence = null): string
+	{
+		try {
+			$res = $this->pdo->lastInsertId($sequence);
+			return $res === false ? '0' : $res;
+		} catch (PDOException $e) {
+			throw $this->convertException($e);
+		}
+	}
+
+
+	public function quote(string $string, int $type = PDO::PARAM_STR): string
+	{
+		try {
+			return $this->pdo->quote($string, $type);
+		} catch (PDOException $e) {
+			throw DriverException::from($e);
+		}
+	}
 }
diff --git a/src/Database/ResultSet.php b/src/Database/ResultSet.php
@@ -39,26 +39,12 @@ public function __construct(
 	) {
 		$time = microtime(true);
 		$this->normalizer = $normalizer;
-		$types = ['boolean' => PDO::PARAM_BOOL, 'integer' => PDO::PARAM_INT, 'resource' => PDO::PARAM_LOB, 'NULL' => PDO::PARAM_NULL];
-
-		try {
-			if (str_starts_with($queryString, '::')) {
-				$connection->getPdo()->{substr($queryString, 2)}();
-			} else {
-				$this->pdoStatement = $connection->getPdo()->prepare($queryString);
-				foreach ($params as $key => $value) {
-					$type = gettype($value);
-					$this->pdoStatement->bindValue(is_int($key) ? $key + 1 : $key, $value, $types[$type] ?? PDO::PARAM_STR);
-				}
-
-				$this->pdoStatement->setFetchMode(PDO::FETCH_ASSOC);
-				@$this->pdoStatement->execute(); // @ PHP generates warning when ATTR_ERRMODE = ERRMODE_EXCEPTION bug #73878
-			}
-		} catch (\PDOException $e) {
-			$e = $connection->getDriver()->convertException($e);
-			$e->queryString = $queryString;
-			$e->params = $params;
-			throw $e;
+
+		$driver = $connection->getDriver();
+		if (str_starts_with($queryString, '::')) {
+			$driver->{substr($queryString, 2)}();
+		} else {
+			$this->pdoStatement = $driver->query($queryString, $params);
 		}
 
 		$this->time = microtime(true) - $time;