From f48901f2dd7ec2a7b46f566154e20b2b5b4ac3ce Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Sep 2024 15:57:10 +0200
Subject: [PATCH 1/7] opened 6.0-dev

---
 composer.json     | 2 +-
 readme.md         | 2 +-
 src/Dibi/dibi.php | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/composer.json b/composer.json
index 0e7f49c7..8216a4e5 100644
--- a/composer.json
+++ b/composer.json
@@ -36,7 +36,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "5.1-dev"
+			"dev-master": "6.0-dev"
 		}
 	}
 }
diff --git a/readme.md b/readme.md
index 75b330b6..4319c7b8 100644
--- a/readme.md
+++ b/readme.md
@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 5.1 requires PHP version 8.2 and supports PHP up to 8.5.
+The Dibi 6.0 requires PHP version 8.2 and supports PHP up to 8.5.
 
 
 Usage
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index a7c0517a..c9c95c4e 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -37,7 +37,7 @@
  */
 class dibi
 {
-	public const Version = '5.1-dev';
+	public const Version = '6.0-dev';
 
 	/** @deprecated use dibi::Version */
 	public const VERSION = self::Version;

From 17955fb2cc3e054343e99056d3116ec8a69e0405 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Sep 2024 15:58:35 +0200
Subject: [PATCH 2/7] removed IConnection (BC break)

---
 src/Dibi/Connection.php |  2 +-
 src/Dibi/interfaces.php | 60 -----------------------------------------
 2 files changed, 1 insertion(+), 61 deletions(-)

diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index b03e0e27..44954dfc 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -21,7 +21,7 @@
  * @property-read int $affectedRows
  * @property-read int $insertId
  */
-class Connection implements IConnection
+class Connection
 {
 	/** function (Event $event); Occurs after query is executed */
 	public ?array $onEvent = [];
diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php
index fbf34d5d..e9604a9e 100644
--- a/src/Dibi/interfaces.php
+++ b/src/Dibi/interfaces.php
@@ -178,63 +178,3 @@ function getIndexes(string $table): array;
 	 */
 	function getForeignKeys(string $table): array;
 }
-
-
-/**
- * Dibi connection.
- */
-interface IConnection
-{
-	/**
-	 * Connects to a database.
-	 */
-	function connect(): void;
-
-	/**
-	 * Disconnects from a database.
-	 */
-	function disconnect(): void;
-
-	/**
-	 * Returns true when connection was established.
-	 */
-	function isConnected(): bool;
-
-	/**
-	 * Returns the driver and connects to a database in lazy mode.
-	 */
-	function getDriver(): Driver;
-
-	/**
-	 * Generates (translates) and executes SQL query.
-	 * @throws Exception
-	 */
-	function query(...$args): Result;
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 * @throws Exception
-	 */
-	function getAffectedRows(): int;
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 * @throws Exception
-	 */
-	function getInsertId(?string $sequence = null): int;
-
-	/**
-	 * Begins a transaction (if supported).
-	 */
-	function begin(?string $savepoint = null): void;
-
-	/**
-	 * Commits statements in a transaction.
-	 */
-	function commit(?string $savepoint = null): void;
-
-	/**
-	 * Rollback changes in a transaction.
-	 */
-	function rollback(?string $savepoint = null): void;
-}

From fada38cbc81d25f85930b6577838fe64a49a8006 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Sep 2024 18:20:04 +0200
Subject: [PATCH 3/7] renamed interfaces (BC break)

Dibi\Driver => Dibi\Drivers\Connection
Dibi\ResultDriver => Dibi\Drivers\Result
Dibi\Reflector => Dibi\Drivers\Engine
---
 src/Dibi/Connection.php                  |  10 +-
 src/Dibi/Drivers/Connection.php          |  97 ++++++++++++
 src/Dibi/Drivers/DummyDriver.php         |   6 +-
 src/Dibi/Drivers/Engine.php              |  40 +++++
 src/Dibi/Drivers/FirebirdDriver.php      |   6 +-
 src/Dibi/Drivers/FirebirdReflector.php   |   5 +-
 src/Dibi/Drivers/FirebirdResult.php      |   2 +-
 src/Dibi/Drivers/MySqlReflector.php      |   4 +-
 src/Dibi/Drivers/MySqliDriver.php        |   6 +-
 src/Dibi/Drivers/MySqliResult.php        |   2 +-
 src/Dibi/Drivers/NoDataResult.php        |   3 +-
 src/Dibi/Drivers/OdbcDriver.php          |   6 +-
 src/Dibi/Drivers/OdbcReflector.php       |   4 +-
 src/Dibi/Drivers/OdbcResult.php          |   2 +-
 src/Dibi/Drivers/OracleDriver.php        |   6 +-
 src/Dibi/Drivers/OracleReflector.php     |   4 +-
 src/Dibi/Drivers/OracleResult.php        |   2 +-
 src/Dibi/Drivers/PdoDriver.php           |   6 +-
 src/Dibi/Drivers/PdoResult.php           |   2 +-
 src/Dibi/Drivers/PostgreDriver.php       |   6 +-
 src/Dibi/Drivers/PostgreReflector.php    |   5 +-
 src/Dibi/Drivers/PostgreResult.php       |   3 +-
 src/Dibi/Drivers/Result.php              |  58 ++++++++
 src/Dibi/Drivers/SqliteDriver.php        |   6 +-
 src/Dibi/Drivers/SqliteReflector.php     |   5 +-
 src/Dibi/Drivers/SqliteResult.php        |   2 +-
 src/Dibi/Drivers/SqlsrvDriver.php        |   6 +-
 src/Dibi/Drivers/SqlsrvReflector.php     |   4 +-
 src/Dibi/Drivers/SqlsrvResult.php        |   2 +-
 src/Dibi/Helpers.php                     |   2 +-
 src/Dibi/IDataSource.php                 |  20 +++
 src/Dibi/Reflection/Column.php           |   2 +-
 src/Dibi/Reflection/Database.php         |   2 +-
 src/Dibi/Reflection/Result.php           |   4 +-
 src/Dibi/Reflection/Table.php            |   4 +-
 src/Dibi/Result.php                      |   6 +-
 src/Dibi/Translator.php                  |   4 +-
 src/Dibi/interfaces.php                  | 180 -----------------------
 tests/dibi/Connection.connect.phpt       |   2 +-
 tests/dibi/Fluent.fetch.limit.mssql.phpt |   2 +-
 40 files changed, 284 insertions(+), 254 deletions(-)
 create mode 100644 src/Dibi/Drivers/Connection.php
 create mode 100644 src/Dibi/Drivers/Engine.php
 create mode 100644 src/Dibi/Drivers/Result.php
 create mode 100644 src/Dibi/IDataSource.php
 delete mode 100644 src/Dibi/interfaces.php

diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index 44954dfc..2d21a216 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -29,7 +29,7 @@ class Connection
 
 	/** @var string[]  resultset formats */
 	private array $formats;
-	private ?Driver $driver = null;
+	private ?Drivers\Connection $driver = null;
 	private ?Translator $translator = null;
 
 	/** @var array<string, callable(object): Expression | null> */
@@ -122,12 +122,12 @@ public function __destruct()
 	 */
 	final public function connect(): void
 	{
-		if ($this->config['driver'] instanceof Driver) {
+		if ($this->config['driver'] instanceof Drivers\Connection) {
 			$this->driver = $this->config['driver'];
 			$this->translator = new Translator($this);
 			return;
 
-		} elseif (is_subclass_of($this->config['driver'], Driver::class)) {
+		} elseif (is_subclass_of($this->config['driver'], Drivers\Connection::class)) {
 			$class = $this->config['driver'];
 
 		} else {
@@ -198,7 +198,7 @@ final public function getConfig(?string $key = null, $default = null): mixed
 	/**
 	 * Returns the driver and connects to a database in lazy mode.
 	 */
-	final public function getDriver(): Driver
+	final public function getDriver(): Drivers\Connection
 	{
 		if (!$this->driver) {
 			$this->connect();
@@ -450,7 +450,7 @@ public function transaction(callable $callback): mixed
 	/**
 	 * Result set factory.
 	 */
-	public function createResultSet(ResultDriver $resultDriver): Result
+	public function createResultSet(Drivers\Result $resultDriver): Result
 	{
 		return (new Result($resultDriver, $this->config['result']['normalize'] ?? true))
 			->setFormats($this->formats);
diff --git a/src/Dibi/Drivers/Connection.php b/src/Dibi/Drivers/Connection.php
new file mode 100644
index 00000000..18f967db
--- /dev/null
+++ b/src/Dibi/Drivers/Connection.php
@@ -0,0 +1,97 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi\DriverException;
+use Dibi\Exception;
+
+
+/**
+ * Database connection driver.
+ */
+interface Connection
+{
+	/**
+	 * Disconnects from a database.
+	 * @throws Exception
+	 */
+	function disconnect(): void;
+
+	/**
+	 * Internal: Executes the SQL query.
+	 * @throws DriverException
+	 */
+	function query(string $sql): ?Result;
+
+	/**
+	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
+	 */
+	function getAffectedRows(): ?int;
+
+	/**
+	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
+	 */
+	function getInsertId(?string $sequence): ?int;
+
+	/**
+	 * Begins a transaction (if supported).
+	 * @throws DriverException
+	 */
+	function begin(?string $savepoint = null): void;
+
+	/**
+	 * Commits statements in a transaction.
+	 * @throws DriverException
+	 */
+	function commit(?string $savepoint = null): void;
+
+	/**
+	 * Rollback changes in a transaction.
+	 * @throws DriverException
+	 */
+	function rollback(?string $savepoint = null): void;
+
+	/**
+	 * Returns the connection resource.
+	 */
+	function getResource(): mixed;
+
+	/**
+	 * Returns the connection reflector.
+	 */
+	function getReflector(): Engine;
+
+	/**
+	 * Encodes data for use in a SQL statement.
+	 */
+	function escapeText(string $value): string;
+
+	function escapeBinary(string $value): string;
+
+	function escapeIdentifier(string $value): string;
+
+	function escapeBool(bool $value): string;
+
+	function escapeDate(\DateTimeInterface $value): string;
+
+	function escapeDateTime(\DateTimeInterface $value): string;
+
+	function escapeDateInterval(\DateInterval $value): string;
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	function escapeLike(string $value, int $pos): string;
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
+}
diff --git a/src/Dibi/Drivers/DummyDriver.php b/src/Dibi/Drivers/DummyDriver.php
index fecc1ba2..4119f86c 100644
--- a/src/Dibi/Drivers/DummyDriver.php
+++ b/src/Dibi/Drivers/DummyDriver.php
@@ -15,14 +15,14 @@
 /**
  * The dummy driver for testing purposes.
  */
-class DummyDriver implements Dibi\Driver, Dibi\ResultDriver, Dibi\Reflector
+class DummyDriver implements Connection, Result, Engine
 {
 	public function disconnect(): void
 	{
 	}
 
 
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		return null;
 	}
@@ -64,7 +64,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return $this;
 	}
diff --git a/src/Dibi/Drivers/Engine.php b/src/Dibi/Drivers/Engine.php
new file mode 100644
index 00000000..ad3863f5
--- /dev/null
+++ b/src/Dibi/Drivers/Engine.php
@@ -0,0 +1,40 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+
+/**
+ * Engine-specific behaviors.
+ */
+interface Engine
+{
+	/**
+	 * Returns list of tables.
+	 * @return array of {name [, (bool) view ]}
+	 */
+	function getTables(): array;
+
+	/**
+	 * Returns metadata for all columns in a table.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getColumns(string $table): array;
+
+	/**
+	 * Returns metadata for all indexes in a table.
+	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
+	 */
+	function getIndexes(string $table): array;
+
+	/**
+	 * Returns metadata for all foreign keys in a table.
+	 */
+	function getForeignKeys(string $table): array;
+}
diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/FirebirdDriver.php
index ade68165..2ffce0e7 100644
--- a/src/Dibi/Drivers/FirebirdDriver.php
+++ b/src/Dibi/Drivers/FirebirdDriver.php
@@ -25,7 +25,7 @@
  *   - buffers (int) => buffers is the number of database buffers to allocate for the server-side cache. If 0 or omitted, server chooses its own default.
  *   - resource (resource) => existing connection resource
  */
-class FirebirdDriver implements Dibi\Driver
+class FirebirdDriver implements Connection
 {
 	public const ErrorExceptionThrown = -836;
 
@@ -86,7 +86,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException|Dibi\Exception
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$resource = $this->inTransaction
 			? $this->transaction
@@ -200,7 +200,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new FirebirdReflector($this);
 	}
diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/FirebirdReflector.php
index 032a8e42..6a884395 100644
--- a/src/Dibi/Drivers/FirebirdReflector.php
+++ b/src/Dibi/Drivers/FirebirdReflector.php
@@ -9,16 +9,15 @@
 
 namespace Dibi\Drivers;
 
-use Dibi;
 
 
 /**
  * The reflector for Firebird/InterBase database.
  */
-class FirebirdReflector implements Dibi\Reflector
+class FirebirdReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/FirebirdResult.php
index fba78435..d46af142 100644
--- a/src/Dibi/Drivers/FirebirdResult.php
+++ b/src/Dibi/Drivers/FirebirdResult.php
@@ -17,7 +17,7 @@
 /**
  * The driver for Firebird/InterBase result set.
  */
-class FirebirdResult implements Dibi\ResultDriver
+class FirebirdResult implements Result
 {
 	public function __construct(
 		/** @var resource */
diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/MySqlReflector.php
index e782e63a..9c0bed77 100644
--- a/src/Dibi/Drivers/MySqlReflector.php
+++ b/src/Dibi/Drivers/MySqlReflector.php
@@ -16,10 +16,10 @@
  * The reflector for MySQL databases.
  * @internal
  */
-class MySqlReflector implements Dibi\Reflector
+class MySqlReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySqliDriver.php
index 1d475266..26fb0deb 100644
--- a/src/Dibi/Drivers/MySqliDriver.php
+++ b/src/Dibi/Drivers/MySqliDriver.php
@@ -32,7 +32,7 @@
  *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
  *   - resource (mysqli) => existing connection resource
  */
-class MySqliDriver implements Dibi\Driver
+class MySqliDriver implements Connection
 {
 	public const ErrorAccessDenied = 1045;
 	public const ErrorDuplicateEntry = 1062;
@@ -148,7 +148,7 @@ public function ping(): bool
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = @$this->connection->query($sql, $this->buffered ? MYSQLI_STORE_RESULT : MYSQLI_USE_RESULT); // intentionally @
 
@@ -265,7 +265,7 @@ public function getResource(): ?\mysqli
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new MySqlReflector($this);
 	}
diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySqliResult.php
index 6276e5f7..cb52afa8 100644
--- a/src/Dibi/Drivers/MySqliResult.php
+++ b/src/Dibi/Drivers/MySqliResult.php
@@ -16,7 +16,7 @@
 /**
  * The driver for MySQL result set.
  */
-class MySqliResult implements Dibi\ResultDriver
+class MySqliResult implements Result
 {
 	public function __construct(
 		private readonly \mysqli_result $resultSet,
diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/NoDataResult.php
index c9ca3832..1e070f7f 100644
--- a/src/Dibi/Drivers/NoDataResult.php
+++ b/src/Dibi/Drivers/NoDataResult.php
@@ -9,13 +9,12 @@
 
 namespace Dibi\Drivers;
 
-use Dibi;
 
 
 /**
  * The driver for no result set.
  */
-class NoDataResult implements Dibi\ResultDriver
+class NoDataResult implements Result
 {
 	public function __construct(
 		private readonly int $rows,
diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/OdbcDriver.php
index 8d87897c..2adaf669 100644
--- a/src/Dibi/Drivers/OdbcDriver.php
+++ b/src/Dibi/Drivers/OdbcDriver.php
@@ -24,7 +24,7 @@
  *   - resource (resource) => existing connection resource
  *   - microseconds (bool) => use microseconds in datetime format?
  */
-class OdbcDriver implements Dibi\Driver
+class OdbcDriver implements Connection
 {
 	/** @var resource */
 	private $connection;
@@ -77,7 +77,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = @odbc_exec($this->connection, $sql); // intentionally @
@@ -176,7 +176,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new OdbcReflector($this);
 	}
diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/OdbcReflector.php
index f259d447..68a24343 100644
--- a/src/Dibi/Drivers/OdbcReflector.php
+++ b/src/Dibi/Drivers/OdbcReflector.php
@@ -15,10 +15,10 @@
 /**
  * The reflector for ODBC connections.
  */
-class OdbcReflector implements Dibi\Reflector
+class OdbcReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/OdbcResult.php
index e86d2871..1271eba7 100644
--- a/src/Dibi/Drivers/OdbcResult.php
+++ b/src/Dibi/Drivers/OdbcResult.php
@@ -16,7 +16,7 @@
 /**
  * The driver interacting with result set via ODBC connections.
  */
-class OdbcResult implements Dibi\ResultDriver
+class OdbcResult implements Result
 {
 	private int $row = 0;
 
diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OracleDriver.php
index 63601761..487f5561 100644
--- a/src/Dibi/Drivers/OracleDriver.php
+++ b/src/Dibi/Drivers/OracleDriver.php
@@ -26,7 +26,7 @@
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  */
-class OracleDriver implements Dibi\Driver
+class OracleDriver implements Connection
 {
 	/** @var resource */
 	private $connection;
@@ -77,7 +77,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = oci_parse($this->connection, $sql);
@@ -190,7 +190,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new OracleReflector($this);
 	}
diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/OracleReflector.php
index 2307063d..bb6e5297 100644
--- a/src/Dibi/Drivers/OracleReflector.php
+++ b/src/Dibi/Drivers/OracleReflector.php
@@ -15,10 +15,10 @@
 /**
  * The reflector for Oracle database.
  */
-class OracleReflector implements Dibi\Reflector
+class OracleReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OracleResult.php
index e601f5a1..1f826f40 100644
--- a/src/Dibi/Drivers/OracleResult.php
+++ b/src/Dibi/Drivers/OracleResult.php
@@ -16,7 +16,7 @@
 /**
  * The driver for Oracle result set.
  */
-class OracleResult implements Dibi\ResultDriver
+class OracleResult implements Result
 {
 	public function __construct(
 		/** @var resource */
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PdoDriver.php
index a6abb8f3..5ae38d49 100644
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PdoDriver.php
@@ -25,7 +25,7 @@
  *   - options (array) => driver specific options {@see PDO::__construct}
  *   - resource (PDO) => existing connection
  */
-class PdoDriver implements Dibi\Driver
+class PdoDriver implements Connection
 {
 	private ?PDO $connection;
 	private ?int $affectedRows;
@@ -80,7 +80,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = $this->connection->query($sql);
 		if ($res) {
@@ -172,7 +172,7 @@ public function getResource(): ?PDO
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return match ($this->driverName) {
 			'mysql' => new MySqlReflector($this),
diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PdoResult.php
index a7941503..886f116b 100644
--- a/src/Dibi/Drivers/PdoResult.php
+++ b/src/Dibi/Drivers/PdoResult.php
@@ -17,7 +17,7 @@
 /**
  * The driver for PDO result set.
  */
-class PdoResult implements Dibi\ResultDriver
+class PdoResult implements Result
 {
 	public function __construct(
 		private ?\PDOStatement $resultSet,
diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PostgreDriver.php
index 637b96d7..7797d727 100644
--- a/src/Dibi/Drivers/PostgreDriver.php
+++ b/src/Dibi/Drivers/PostgreDriver.php
@@ -27,7 +27,7 @@
  *   - resource (PgSql\Connection) => existing connection resource
  *   - connect_type (int) => see pg_connect()
  */
-class PostgreDriver implements Dibi\Driver
+class PostgreDriver implements Connection
 {
 	private PgSql\Connection $connection;
 	private ?int $affectedRows;
@@ -110,7 +110,7 @@ public function ping(): bool
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = @pg_query($this->connection, $sql); // intentionally @
@@ -232,7 +232,7 @@ public function getResource(): PgSql\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new PostgreReflector($this);
 	}
diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/PostgreReflector.php
index ca4854fe..2fb27148 100644
--- a/src/Dibi/Drivers/PostgreReflector.php
+++ b/src/Dibi/Drivers/PostgreReflector.php
@@ -9,16 +9,15 @@
 
 namespace Dibi\Drivers;
 
-use Dibi;
 
 
 /**
  * The reflector for PostgreSQL database.
  */
-class PostgreReflector implements Dibi\Reflector
+class PostgreReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PostgreResult.php
index 763dabaf..96b9d750 100644
--- a/src/Dibi/Drivers/PostgreResult.php
+++ b/src/Dibi/Drivers/PostgreResult.php
@@ -9,7 +9,6 @@
 
 namespace Dibi\Drivers;
 
-use Dibi;
 use Dibi\Helpers;
 use PgSql;
 
@@ -17,7 +16,7 @@
 /**
  * The driver for PostgreSQL result set.
  */
-class PostgreResult implements Dibi\ResultDriver
+class PostgreResult implements Result
 {
 	public function __construct(
 		private readonly PgSql\Result $resultSet,
diff --git a/src/Dibi/Drivers/Result.php b/src/Dibi/Drivers/Result.php
new file mode 100644
index 00000000..23372cdb
--- /dev/null
+++ b/src/Dibi/Drivers/Result.php
@@ -0,0 +1,58 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi\Drivers;
+
+use Dibi\Exception;
+
+
+/**
+ * Database result driver.
+ */
+interface Result
+{
+	/**
+	 * Returns the number of rows in a result set.
+	 */
+	function getRowCount(): int;
+
+	/**
+	 * Moves cursor position without fetching row.
+	 * @throws Exception
+	 */
+	function seek(int $row): bool;
+
+	/**
+	 * Fetches the row at current position and moves the internal cursor to the next position.
+	 * @param  bool  $type  true for associative array, false for numeric
+	 * @internal
+	 */
+	function fetch(bool $type): ?array;
+
+	/**
+	 * Frees the resources allocated for this result set.
+	 */
+	function free(): void;
+
+	/**
+	 * Returns metadata for all columns in a result set.
+	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
+	 */
+	function getResultColumns(): array;
+
+	/**
+	 * Returns the result set resource.
+	 */
+	function getResultResource(): mixed;
+
+	/**
+	 * Decodes data from result set.
+	 */
+	function unescapeBinary(string $value): string;
+}
diff --git a/src/Dibi/Drivers/SqliteDriver.php b/src/Dibi/Drivers/SqliteDriver.php
index 7a2fa5e7..dab671a2 100644
--- a/src/Dibi/Drivers/SqliteDriver.php
+++ b/src/Dibi/Drivers/SqliteDriver.php
@@ -23,7 +23,7 @@
  *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (SQLite3) => existing connection resource
  */
-class SqliteDriver implements Dibi\Driver
+class SqliteDriver implements Connection
 {
 	private SQLite3 $connection;
 	private string $fmtDate;
@@ -73,7 +73,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$res = @$this->connection->query($sql); // intentionally @
 		if ($code = $this->connection->lastErrorCode()) {
@@ -174,7 +174,7 @@ public function getResource(): ?SQLite3
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new SqliteReflector($this);
 	}
diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/SqliteReflector.php
index 1d530997..d828e85c 100644
--- a/src/Dibi/Drivers/SqliteReflector.php
+++ b/src/Dibi/Drivers/SqliteReflector.php
@@ -9,16 +9,15 @@
 
 namespace Dibi\Drivers;
 
-use Dibi;
 
 
 /**
  * The reflector for SQLite database.
  */
-class SqliteReflector implements Dibi\Reflector
+class SqliteReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SqliteResult.php
index 08d38904..04df4a53 100644
--- a/src/Dibi/Drivers/SqliteResult.php
+++ b/src/Dibi/Drivers/SqliteResult.php
@@ -17,7 +17,7 @@
 /**
  * The driver for SQLite result set.
  */
-class SqliteResult implements Dibi\ResultDriver
+class SqliteResult implements Result
 {
 	public function __construct(
 		private readonly \SQLite3Result $resultSet,
diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SqlsrvDriver.php
index 0e39fd5f..383a9eb0 100644
--- a/src/Dibi/Drivers/SqlsrvDriver.php
+++ b/src/Dibi/Drivers/SqlsrvDriver.php
@@ -26,7 +26,7 @@
  *   - charset => character encoding to set (default is UTF-8)
  *   - resource (resource) => existing connection resource
  */
-class SqlsrvDriver implements Dibi\Driver
+class SqlsrvDriver implements Connection
 {
 	/** @var resource */
 	private $connection;
@@ -84,7 +84,7 @@ public function disconnect(): void
 	 * Executes the SQL query.
 	 * @throws Dibi\DriverException
 	 */
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Result
 	{
 		$this->affectedRows = null;
 		$res = sqlsrv_query($this->connection, $sql);
@@ -171,7 +171,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Dibi\Reflector
+	public function getReflector(): Engine
 	{
 		return new SqlsrvReflector($this);
 	}
diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/SqlsrvReflector.php
index bbf0418d..47109676 100644
--- a/src/Dibi/Drivers/SqlsrvReflector.php
+++ b/src/Dibi/Drivers/SqlsrvReflector.php
@@ -16,10 +16,10 @@
 /**
  * The reflector for Microsoft SQL Server and SQL Azure databases.
  */
-class SqlsrvReflector implements Dibi\Reflector
+class SqlsrvReflector implements Engine
 {
 	public function __construct(
-		private readonly Dibi\Driver $driver,
+		private readonly Connection $driver,
 	) {
 	}
 
diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SqlsrvResult.php
index 94a76179..2180d1bb 100644
--- a/src/Dibi/Drivers/SqlsrvResult.php
+++ b/src/Dibi/Drivers/SqlsrvResult.php
@@ -16,7 +16,7 @@
 /**
  * The driver for Microsoft SQL Server and SQL Azure result set.
  */
-class SqlsrvResult implements Dibi\ResultDriver
+class SqlsrvResult implements Result
 {
 	public function __construct(
 		/** @var resource */
diff --git a/src/Dibi/Helpers.php b/src/Dibi/Helpers.php
index 74719513..f4a52824 100644
--- a/src/Dibi/Helpers.php
+++ b/src/Dibi/Helpers.php
@@ -159,7 +159,7 @@ public static function getSuggestion(array $items, string $value): ?string
 
 
 	/** @internal */
-	public static function escape(Driver $driver, $value, string $type): string
+	public static function escape(Drivers\Connection $driver, $value, string $type): string
 	{
 		$types = [
 			Type::Text => 'text',
diff --git a/src/Dibi/IDataSource.php b/src/Dibi/IDataSource.php
new file mode 100644
index 00000000..9b41dc87
--- /dev/null
+++ b/src/Dibi/IDataSource.php
@@ -0,0 +1,20 @@
+<?php
+
+/**
+ * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
+ * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Dibi;
+
+
+/**
+ * Provides an interface between a dataset and data-aware components.
+ */
+interface IDataSource extends \Countable, \IteratorAggregate
+{
+	//function \IteratorAggregate::getIterator();
+	//function \Countable::count();
+}
diff --git a/src/Dibi/Reflection/Column.php b/src/Dibi/Reflection/Column.php
index 30905065..3eaa5030 100644
--- a/src/Dibi/Reflection/Column.php
+++ b/src/Dibi/Reflection/Column.php
@@ -28,7 +28,7 @@
 class Column
 {
 	public function __construct(
-		private readonly ?Dibi\Reflector $reflector,
+		private readonly ?Dibi\Drivers\Engine $reflector,
 		private array $info,
 	) {
 	}
diff --git a/src/Dibi/Reflection/Database.php b/src/Dibi/Reflection/Database.php
index 85a87040..94aca6db 100644
--- a/src/Dibi/Reflection/Database.php
+++ b/src/Dibi/Reflection/Database.php
@@ -27,7 +27,7 @@ class Database
 
 
 	public function __construct(
-		private readonly Dibi\Reflector $reflector,
+		private readonly Dibi\Drivers\Engine $reflector,
 		private ?string $name = null,
 	) {
 	}
diff --git a/src/Dibi/Reflection/Result.php b/src/Dibi/Reflection/Result.php
index 084c5c50..3f817313 100644
--- a/src/Dibi/Reflection/Result.php
+++ b/src/Dibi/Reflection/Result.php
@@ -29,7 +29,7 @@ class Result
 
 
 	public function __construct(
-		private readonly Dibi\ResultDriver $driver,
+		private readonly Dibi\Drivers\Result $driver,
 	) {
 	}
 
@@ -79,7 +79,7 @@ protected function initColumns(): void
 	{
 		if (!isset($this->columns)) {
 			$this->columns = [];
-			$reflector = $this->driver instanceof Dibi\Reflector
+			$reflector = $this->driver instanceof Dibi\Drivers\Engine
 				? $this->driver
 				: null;
 			foreach ($this->driver->getResultColumns() as $info) {
diff --git a/src/Dibi/Reflection/Table.php b/src/Dibi/Reflection/Table.php
index 53e281d2..5e1829fc 100644
--- a/src/Dibi/Reflection/Table.php
+++ b/src/Dibi/Reflection/Table.php
@@ -26,7 +26,7 @@
  */
 class Table
 {
-	private readonly Dibi\Reflector $reflector;
+	private readonly Dibi\Drivers\Engine $reflector;
 	private string $name;
 	private bool $view;
 
@@ -41,7 +41,7 @@ class Table
 	private ?Index $primaryKey;
 
 
-	public function __construct(Dibi\Reflector $reflector, array $info)
+	public function __construct(Dibi\Drivers\Engine $reflector, array $info)
 	{
 		$this->reflector = $reflector;
 		$this->name = $info['name'];
diff --git a/src/Dibi/Result.php b/src/Dibi/Result.php
index 50046ac1..9b252cda 100644
--- a/src/Dibi/Result.php
+++ b/src/Dibi/Result.php
@@ -20,7 +20,7 @@
  */
 class Result implements IDataSource
 {
-	private ?ResultDriver $driver;
+	private ?Drivers\Result $driver;
 
 	/** Translate table */
 	private array $types = [];
@@ -37,7 +37,7 @@ class Result implements IDataSource
 	private array $formats = [];
 
 
-	public function __construct(ResultDriver $driver, bool $normalize = true)
+	public function __construct(Drivers\Result $driver, bool $normalize = true)
 	{
 		$this->driver = $driver;
 		if ($normalize) {
@@ -62,7 +62,7 @@ final public function free(): void
 	 * Safe access to property $driver.
 	 * @throws \RuntimeException
 	 */
-	final public function getResultDriver(): ResultDriver
+	final public function getResultDriver(): Drivers\Result
 	{
 		if ($this->driver === null) {
 			throw new \RuntimeException('Result-set was released from memory.');
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index be28e187..dca26a1a 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -17,8 +17,8 @@
  */
 final class Translator
 {
-	private readonly Connection $connection;
-	private readonly Driver $driver;
+	private Connection $connection;
+	private readonly Drivers\Connection $driver;
 	private int $cursor = 0;
 	private array $args;
 
diff --git a/src/Dibi/interfaces.php b/src/Dibi/interfaces.php
deleted file mode 100644
index e9604a9e..00000000
--- a/src/Dibi/interfaces.php
+++ /dev/null
@@ -1,180 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi;
-
-
-/**
- * Provides an interface between a dataset and data-aware components.
- */
-interface IDataSource extends \Countable, \IteratorAggregate
-{
-	//function \IteratorAggregate::getIterator();
-	//function \Countable::count();
-}
-
-
-/**
- * Driver interface.
- */
-interface Driver
-{
-	/**
-	 * Disconnects from a database.
-	 * @throws Exception
-	 */
-	function disconnect(): void;
-
-	/**
-	 * Internal: Executes the SQL query.
-	 * @throws DriverException
-	 */
-	function query(string $sql): ?ResultDriver;
-
-	/**
-	 * Gets the number of affected rows by the last INSERT, UPDATE or DELETE query.
-	 */
-	function getAffectedRows(): ?int;
-
-	/**
-	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
-	 */
-	function getInsertId(?string $sequence): ?int;
-
-	/**
-	 * Begins a transaction (if supported).
-	 * @throws DriverException
-	 */
-	function begin(?string $savepoint = null): void;
-
-	/**
-	 * Commits statements in a transaction.
-	 * @throws DriverException
-	 */
-	function commit(?string $savepoint = null): void;
-
-	/**
-	 * Rollback changes in a transaction.
-	 * @throws DriverException
-	 */
-	function rollback(?string $savepoint = null): void;
-
-	/**
-	 * Returns the connection resource.
-	 */
-	function getResource(): mixed;
-
-	/**
-	 * Returns the connection reflector.
-	 */
-	function getReflector(): Reflector;
-
-	/**
-	 * Encodes data for use in a SQL statement.
-	 */
-	function escapeText(string $value): string;
-
-	function escapeBinary(string $value): string;
-
-	function escapeIdentifier(string $value): string;
-
-	function escapeBool(bool $value): string;
-
-	function escapeDate(\DateTimeInterface $value): string;
-
-	function escapeDateTime(\DateTimeInterface $value): string;
-
-	function escapeDateInterval(\DateInterval $value): string;
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	function escapeLike(string $value, int $pos): string;
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
-}
-
-
-/**
- * Result set driver interface.
- */
-interface ResultDriver
-{
-	/**
-	 * Returns the number of rows in a result set.
-	 */
-	function getRowCount(): int;
-
-	/**
-	 * Moves cursor position without fetching row.
-	 * @throws Exception
-	 */
-	function seek(int $row): bool;
-
-	/**
-	 * Fetches the row at current position and moves the internal cursor to the next position.
-	 * @param  bool  $type  true for associative array, false for numeric
-	 * @internal
-	 */
-	function fetch(bool $type): ?array;
-
-	/**
-	 * Frees the resources allocated for this result set.
-	 */
-	function free(): void;
-
-	/**
-	 * Returns metadata for all columns in a result set.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getResultColumns(): array;
-
-	/**
-	 * Returns the result set resource.
-	 */
-	function getResultResource(): mixed;
-
-	/**
-	 * Decodes data from result set.
-	 */
-	function unescapeBinary(string $value): string;
-}
-
-
-/**
- * Reflection driver.
- */
-interface Reflector
-{
-	/**
-	 * Returns list of tables.
-	 * @return array of {name [, (bool) view ]}
-	 */
-	function getTables(): array;
-
-	/**
-	 * Returns metadata for all columns in a table.
-	 * @return array of {name, nativetype [, table, fullname, (int) size, (bool) nullable, (mixed) default, (bool) autoincrement, (array) vendor ]}
-	 */
-	function getColumns(string $table): array;
-
-	/**
-	 * Returns metadata for all indexes in a table.
-	 * @return array of {name, (array of names) columns [, (bool) unique, (bool) primary ]}
-	 */
-	function getIndexes(string $table): array;
-
-	/**
-	 * Returns metadata for all foreign keys in a table.
-	 */
-	function getForeignKeys(string $table): array;
-}
diff --git a/tests/dibi/Connection.connect.phpt b/tests/dibi/Connection.connect.phpt
index e48fdec0..5557c8e8 100644
--- a/tests/dibi/Connection.connect.phpt
+++ b/tests/dibi/Connection.connect.phpt
@@ -36,7 +36,7 @@ test('config retrieval and driver instance access', function () use ($config) {
 
 	Assert::null($conn->getConfig('lazy'));
 	Assert::same($config['driver'], $conn->getConfig('driver'));
-	Assert::type(Dibi\Driver::class, $conn->getDriver());
+	Assert::type(Dibi\Drivers\Connection::class, $conn->getDriver());
 });
 
 
diff --git a/tests/dibi/Fluent.fetch.limit.mssql.phpt b/tests/dibi/Fluent.fetch.limit.mssql.phpt
index d07ce4e8..cc358042 100644
--- a/tests/dibi/Fluent.fetch.limit.mssql.phpt
+++ b/tests/dibi/Fluent.fetch.limit.mssql.phpt
@@ -19,7 +19,7 @@ class MockDriver extends Dibi\Drivers\SqlsrvDriver
 	}
 
 
-	public function query(string $sql): ?Dibi\ResultDriver
+	public function query(string $sql): ?Dibi\Drivers\Result
 	{
 		return new MockResult;
 	}

From 8f5ba62e25523275e72b8a50f0e801dafca15071 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Sep 2024 16:39:56 +0200
Subject: [PATCH 4/7] renamed driver classes

---
 src/Dibi/Connection.php                       | 17 +++++++++--
 .../{DummyDriver.php => Dummy/Connection.php} |  7 +++--
 .../{NoDataResult.php => Dummy/Result.php}    |  5 ++--
 .../FirebirdEngine.php}                       |  6 ++--
 .../MySQLEngine.php}                          |  6 ++--
 .../ODBCEngine.php}                           |  6 ++--
 .../OracleEngine.php}                         |  6 ++--
 .../PostgreSQLEngine.php}                     |  6 ++--
 .../SQLServerEngine.php}                      |  7 +++--
 .../SQLiteEngine.php}                         |  6 ++--
 .../Connection.php}                           | 13 ++++----
 .../Result.php}                               |  7 +++--
 .../Connection.php}                           | 13 ++++----
 .../{MySqliResult.php => MySQLi/Result.php}   |  5 ++--
 .../{OracleDriver.php => OCI8/Connection.php} | 13 ++++----
 .../{OracleResult.php => OCI8/Result.php}     |  5 ++--
 .../{OdbcDriver.php => ODBC/Connection.php}   | 13 ++++----
 .../{OdbcResult.php => ODBC/Result.php}       |  5 ++--
 .../{PdoDriver.php => PDO/Connection.php}     | 30 ++++++++++---------
 .../Drivers/{PdoResult.php => PDO/Result.php} |  5 ++--
 .../Connection.php}                           | 13 ++++----
 .../{PostgreResult.php => PgSQL/Result.php}   |  5 ++--
 .../Connection.php}                           | 13 ++++----
 .../{SqlsrvResult.php => SQLSrv/Result.php}   |  5 ++--
 .../Connection.php}                           | 13 ++++----
 .../{SqliteResult.php => SQLite3/Result.php}  |  5 ++--
 src/Dibi/Drivers/Sqlite3Driver.php            | 18 -----------
 src/Dibi/Drivers/Sqlite3Result.php            | 18 -----------
 tests/dibi/Fluent.fetch.limit.mssql.phpt      |  8 +++--
 tests/dibi/PdoDriver.providedConnection.phpt  |  2 +-
 30 files changed, 145 insertions(+), 136 deletions(-)
 rename src/Dibi/Drivers/{DummyDriver.php => Dummy/Connection.php} (94%)
 rename src/Dibi/Drivers/{NoDataResult.php => Dummy/Result.php} (90%)
 rename src/Dibi/Drivers/{FirebirdReflector.php => Engines/FirebirdEngine.php} (98%)
 rename src/Dibi/Drivers/{MySqlReflector.php => Engines/MySQLEngine.php} (96%)
 rename src/Dibi/Drivers/{OdbcReflector.php => Engines/ODBCEngine.php} (93%)
 rename src/Dibi/Drivers/{OracleReflector.php => Engines/OracleEngine.php} (92%)
 rename src/Dibi/Drivers/{PostgreReflector.php => Engines/PostgreSQLEngine.php} (98%)
 rename src/Dibi/Drivers/{SqlsrvReflector.php => Engines/SQLServerEngine.php} (96%)
 rename src/Dibi/Drivers/{SqliteReflector.php => Engines/SQLiteEngine.php} (96%)
 rename src/Dibi/Drivers/{FirebirdDriver.php => Firebird/Connection.php} (95%)
 rename src/Dibi/Drivers/{FirebirdResult.php => Firebird/Result.php} (94%)
 rename src/Dibi/Drivers/{MySqliDriver.php => MySQLi/Connection.php} (96%)
 rename src/Dibi/Drivers/{MySqliResult.php => MySQLi/Result.php} (96%)
 rename src/Dibi/Drivers/{OracleDriver.php => OCI8/Connection.php} (96%)
 rename src/Dibi/Drivers/{OracleResult.php => OCI8/Result.php} (96%)
 rename src/Dibi/Drivers/{OdbcDriver.php => ODBC/Connection.php} (95%)
 rename src/Dibi/Drivers/{OdbcResult.php => ODBC/Result.php} (96%)
 rename src/Dibi/Drivers/{PdoDriver.php => PDO/Connection.php} (91%)
 rename src/Dibi/Drivers/{PdoResult.php => PDO/Result.php} (96%)
 rename src/Dibi/Drivers/{PostgreDriver.php => PgSQL/Connection.php} (96%)
 rename src/Dibi/Drivers/{PostgreResult.php => PgSQL/Result.php} (95%)
 rename src/Dibi/Drivers/{SqlsrvDriver.php => SQLSrv/Connection.php} (95%)
 rename src/Dibi/Drivers/{SqlsrvResult.php => SQLSrv/Result.php} (95%)
 rename src/Dibi/Drivers/{SqliteDriver.php => SQLite3/Connection.php} (95%)
 rename src/Dibi/Drivers/{SqliteResult.php => SQLite3/Result.php} (96%)
 delete mode 100644 src/Dibi/Drivers/Sqlite3Driver.php
 delete mode 100644 src/Dibi/Drivers/Sqlite3Result.php

diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index 2d21a216..e7e430b9 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -23,6 +23,18 @@
  */
 class Connection
 {
+	private const Drivers = [
+		'firebird' => Drivers\Ibase\Connection::class,
+		'mysqli' => Drivers\MySQLi\Connection::class,
+		'odbc' => Drivers\ODBC\Connection::class,
+		'oracle' => Drivers\OCI8\Connection::class,
+		'pdo' => Drivers\PDO\Connection::class,
+		'postgre' => Drivers\PgSQL\Connection::class,
+		'sqlite3' => Drivers\SQLite3\Connection::class,
+		'sqlite' => Drivers\SQLite3\Connection::class,
+		'sqlsrv' => Drivers\SQLSrv\Connection::class,
+	];
+
 	/** function (Event $event); Occurs after query is executed */
 	public ?array $onEvent = [];
 	private array $config;
@@ -131,8 +143,7 @@ final public function connect(): void
 			$class = $this->config['driver'];
 
 		} else {
-			$class = preg_replace(['#\W#', '#sql#'], ['_', 'Sql'], ucfirst(strtolower($this->config['driver'])));
-			$class = "Dibi\\Drivers\\{$class}Driver";
+			$class = self::Drivers[strtolower($this->config['driver'])] ?? throw new Exception("Unknown driver '{$this->config['driver']}'.");
 			if (!class_exists($class)) {
 				throw new Exception("Unable to create instance of Dibi driver '$class'.");
 			}
@@ -286,7 +297,7 @@ final public function nativeQuery(#[Language('SQL')] string $sql): Result
 			throw $e;
 		}
 
-		$res = $this->createResultSet($res ?: new Drivers\NoDataResult(max(0, $this->driver->getAffectedRows())));
+		$res = $this->createResultSet($res ?: new Drivers\Dummy\Result(max(0, $this->driver->getAffectedRows())));
 		if ($event) {
 			$this->onEvent($event->done($res));
 		}
diff --git a/src/Dibi/Drivers/DummyDriver.php b/src/Dibi/Drivers/Dummy/Connection.php
similarity index 94%
rename from src/Dibi/Drivers/DummyDriver.php
rename to src/Dibi/Drivers/Dummy/Connection.php
index 4119f86c..894db075 100644
--- a/src/Dibi/Drivers/DummyDriver.php
+++ b/src/Dibi/Drivers/Dummy/Connection.php
@@ -7,15 +7,16 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Dummy;
 
 use Dibi;
+use Dibi\Drivers;
 
 
 /**
  * The dummy driver for testing purposes.
  */
-class DummyDriver implements Connection, Result, Engine
+class Connection implements Drivers\Connection, Drivers\Result, Drivers\Engine
 {
 	public function disconnect(): void
 	{
@@ -64,7 +65,7 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
 		return $this;
 	}
diff --git a/src/Dibi/Drivers/NoDataResult.php b/src/Dibi/Drivers/Dummy/Result.php
similarity index 90%
rename from src/Dibi/Drivers/NoDataResult.php
rename to src/Dibi/Drivers/Dummy/Result.php
index 1e070f7f..34f901ec 100644
--- a/src/Dibi/Drivers/NoDataResult.php
+++ b/src/Dibi/Drivers/Dummy/Result.php
@@ -7,14 +7,15 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Dummy;
 
+use Dibi\Drivers;
 
 
 /**
  * The driver for no result set.
  */
-class NoDataResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		private readonly int $rows,
diff --git a/src/Dibi/Drivers/FirebirdReflector.php b/src/Dibi/Drivers/Engines/FirebirdEngine.php
similarity index 98%
rename from src/Dibi/Drivers/FirebirdReflector.php
rename to src/Dibi/Drivers/Engines/FirebirdEngine.php
index 6a884395..3ad6d951 100644
--- a/src/Dibi/Drivers/FirebirdReflector.php
+++ b/src/Dibi/Drivers/Engines/FirebirdEngine.php
@@ -7,14 +7,16 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Firebird/InterBase database.
  */
-class FirebirdReflector implements Engine
+class FirebirdEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/MySqlReflector.php b/src/Dibi/Drivers/Engines/MySQLEngine.php
similarity index 96%
rename from src/Dibi/Drivers/MySqlReflector.php
rename to src/Dibi/Drivers/Engines/MySQLEngine.php
index 9c0bed77..722a7847 100644
--- a/src/Dibi/Drivers/MySqlReflector.php
+++ b/src/Dibi/Drivers/Engines/MySQLEngine.php
@@ -7,16 +7,18 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for MySQL databases.
  * @internal
  */
-class MySqlReflector implements Engine
+class MySQLEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/OdbcReflector.php b/src/Dibi/Drivers/Engines/ODBCEngine.php
similarity index 93%
rename from src/Dibi/Drivers/OdbcReflector.php
rename to src/Dibi/Drivers/Engines/ODBCEngine.php
index 68a24343..35ed5b06 100644
--- a/src/Dibi/Drivers/OdbcReflector.php
+++ b/src/Dibi/Drivers/Engines/ODBCEngine.php
@@ -7,15 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for ODBC connections.
  */
-class OdbcReflector implements Engine
+class ODBCEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/OracleReflector.php b/src/Dibi/Drivers/Engines/OracleEngine.php
similarity index 92%
rename from src/Dibi/Drivers/OracleReflector.php
rename to src/Dibi/Drivers/Engines/OracleEngine.php
index bb6e5297..3fa723e3 100644
--- a/src/Dibi/Drivers/OracleReflector.php
+++ b/src/Dibi/Drivers/Engines/OracleEngine.php
@@ -7,15 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Oracle database.
  */
-class OracleReflector implements Engine
+class OracleEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/PostgreReflector.php b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
similarity index 98%
rename from src/Dibi/Drivers/PostgreReflector.php
rename to src/Dibi/Drivers/Engines/PostgreSQLEngine.php
index 2fb27148..5622c8c7 100644
--- a/src/Dibi/Drivers/PostgreReflector.php
+++ b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
@@ -7,14 +7,16 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for PostgreSQL database.
  */
-class PostgreReflector implements Engine
+class PostgreSQLEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/SqlsrvReflector.php b/src/Dibi/Drivers/Engines/SQLServerEngine.php
similarity index 96%
rename from src/Dibi/Drivers/SqlsrvReflector.php
rename to src/Dibi/Drivers/Engines/SQLServerEngine.php
index 47109676..0b6035ef 100644
--- a/src/Dibi/Drivers/SqlsrvReflector.php
+++ b/src/Dibi/Drivers/Engines/SQLServerEngine.php
@@ -7,16 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
 use Dibi;
-use function sprintf;
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for Microsoft SQL Server and SQL Azure databases.
  */
-class SqlsrvReflector implements Engine
+class SQLServerEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/SqliteReflector.php b/src/Dibi/Drivers/Engines/SQLiteEngine.php
similarity index 96%
rename from src/Dibi/Drivers/SqliteReflector.php
rename to src/Dibi/Drivers/Engines/SQLiteEngine.php
index d828e85c..f556081f 100644
--- a/src/Dibi/Drivers/SqliteReflector.php
+++ b/src/Dibi/Drivers/Engines/SQLiteEngine.php
@@ -7,14 +7,16 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Engines;
 
+use Dibi\Drivers\Connection;
+use Dibi\Drivers\Engine;
 
 
 /**
  * The reflector for SQLite database.
  */
-class SqliteReflector implements Engine
+class SQLiteEngine implements Engine
 {
 	public function __construct(
 		private readonly Connection $driver,
diff --git a/src/Dibi/Drivers/FirebirdDriver.php b/src/Dibi/Drivers/Firebird/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/FirebirdDriver.php
rename to src/Dibi/Drivers/Firebird/Connection.php
index 2ffce0e7..72490511 100644
--- a/src/Dibi/Drivers/FirebirdDriver.php
+++ b/src/Dibi/Drivers/Firebird/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Ibase;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use function is_resource;
 
@@ -25,7 +26,7 @@
  *   - buffers (int) => buffers is the number of database buffers to allocate for the server-side cache. If 0 or omitted, server chooses its own default.
  *   - resource (resource) => existing connection resource
  */
-class FirebirdDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	public const ErrorExceptionThrown = -836;
 
@@ -200,9 +201,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new FirebirdReflector($this);
+		return new Drivers\Engines\FirebirdEngine($this);
 	}
 
 
@@ -210,9 +211,9 @@ public function getReflector(): Engine
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): FirebirdResult
+	public function createResultDriver($resource): Result
 	{
-		return new FirebirdResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/FirebirdResult.php b/src/Dibi/Drivers/Firebird/Result.php
similarity index 94%
rename from src/Dibi/Drivers/FirebirdResult.php
rename to src/Dibi/Drivers/Firebird/Result.php
index d46af142..c979973a 100644
--- a/src/Dibi/Drivers/FirebirdResult.php
+++ b/src/Dibi/Drivers/Firebird/Result.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\Ibase;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use function is_resource;
 
@@ -17,7 +18,7 @@
 /**
  * The driver for Firebird/InterBase result set.
  */
-class FirebirdResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		/** @var resource */
@@ -46,7 +47,7 @@ public function fetch(bool $assoc): ?array
 			: @ibase_fetch_row($this->resultSet, IBASE_TEXT); // intentionally @
 
 		if (ibase_errcode()) {
-			if (ibase_errcode() === FirebirdDriver::ERROR_EXCEPTION_THROWN) {
+			if (ibase_errcode() === Connection::ERROR_EXCEPTION_THROWN) {
 				preg_match('/exception (\d+) (\w+) (.*)/is', ibase_errmsg(), $match);
 				throw new Dibi\ProcedureException($match[3], $match[1], $match[2]);
 
diff --git a/src/Dibi/Drivers/MySqliDriver.php b/src/Dibi/Drivers/MySQLi/Connection.php
similarity index 96%
rename from src/Dibi/Drivers/MySqliDriver.php
rename to src/Dibi/Drivers/MySQLi/Connection.php
index 26fb0deb..05cf2bc3 100644
--- a/src/Dibi/Drivers/MySqliDriver.php
+++ b/src/Dibi/Drivers/MySQLi/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\MySQLi;
 
 use Dibi;
+use Dibi\Drivers;
 use function in_array;
 use const MYSQLI_REPORT_OFF, MYSQLI_STORE_RESULT, MYSQLI_USE_RESULT, PREG_SET_ORDER;
 
@@ -32,7 +33,7 @@
  *   - sqlmode => see http://dev.mysql.com/doc/refman/5.0/en/server-sql-mode.html
  *   - resource (mysqli) => existing connection resource
  */
-class MySqliDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	public const ErrorAccessDenied = 1045;
 	public const ErrorDuplicateEntry = 1062;
@@ -265,18 +266,18 @@ public function getResource(): ?\mysqli
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new MySqlReflector($this);
+		return new Drivers\Engines\MySQLEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\mysqli_result $result): MySqliResult
+	public function createResultDriver(\mysqli_result $result): Result
 	{
-		return new MySqliResult($result, $this->buffered);
+		return new Result($result, $this->buffered);
 	}
 
 
diff --git a/src/Dibi/Drivers/MySqliResult.php b/src/Dibi/Drivers/MySQLi/Result.php
similarity index 96%
rename from src/Dibi/Drivers/MySqliResult.php
rename to src/Dibi/Drivers/MySQLi/Result.php
index cb52afa8..2fe38f67 100644
--- a/src/Dibi/Drivers/MySqliResult.php
+++ b/src/Dibi/Drivers/MySQLi/Result.php
@@ -7,16 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\MySQLi;
 
 use Dibi;
+use Dibi\Drivers;
 use const MYSQLI_TYPE_LONG, MYSQLI_TYPE_SHORT, MYSQLI_TYPE_TIME, MYSQLI_TYPE_TINY;
 
 
 /**
  * The driver for MySQL result set.
  */
-class MySqliResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		private readonly \mysqli_result $resultSet,
diff --git a/src/Dibi/Drivers/OracleDriver.php b/src/Dibi/Drivers/OCI8/Connection.php
similarity index 96%
rename from src/Dibi/Drivers/OracleDriver.php
rename to src/Dibi/Drivers/OCI8/Connection.php
index 487f5561..2eb5bc2b 100644
--- a/src/Dibi/Drivers/OracleDriver.php
+++ b/src/Dibi/Drivers/OCI8/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\OCI8;
 
 use Dibi;
+use Dibi\Drivers;
 use function in_array, is_resource;
 
 
@@ -26,7 +27,7 @@
  *   - resource (resource) => existing connection resource
  *   - persistent => Creates persistent connections with oci_pconnect instead of oci_new_connect
  */
-class OracleDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
@@ -190,9 +191,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new OracleReflector($this);
+		return new Drivers\Engines\OracleEngine($this);
 	}
 
 
@@ -200,9 +201,9 @@ public function getReflector(): Engine
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): OracleResult
+	public function createResultDriver($resource): Result
 	{
-		return new OracleResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/OracleResult.php b/src/Dibi/Drivers/OCI8/Result.php
similarity index 96%
rename from src/Dibi/Drivers/OracleResult.php
rename to src/Dibi/Drivers/OCI8/Result.php
index 1f826f40..e9c5c584 100644
--- a/src/Dibi/Drivers/OracleResult.php
+++ b/src/Dibi/Drivers/OCI8/Result.php
@@ -7,16 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\OCI8;
 
 use Dibi;
+use Dibi\Drivers;
 use function is_resource;
 
 
 /**
  * The driver for Oracle result set.
  */
-class OracleResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		/** @var resource */
diff --git a/src/Dibi/Drivers/OdbcDriver.php b/src/Dibi/Drivers/ODBC/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/OdbcDriver.php
rename to src/Dibi/Drivers/ODBC/Connection.php
index 2adaf669..8213cff5 100644
--- a/src/Dibi/Drivers/OdbcDriver.php
+++ b/src/Dibi/Drivers/ODBC/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\ODBC;
 
 use Dibi;
+use Dibi\Drivers;
 use function is_resource;
 
 
@@ -24,7 +25,7 @@
  *   - resource (resource) => existing connection resource
  *   - microseconds (bool) => use microseconds in datetime format?
  */
-class OdbcDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
@@ -176,9 +177,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new OdbcReflector($this);
+		return new Drivers\Engines\ODBCEngine($this);
 	}
 
 
@@ -186,9 +187,9 @@ public function getReflector(): Engine
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): OdbcResult
+	public function createResultDriver($resource): Result
 	{
-		return new OdbcResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/OdbcResult.php b/src/Dibi/Drivers/ODBC/Result.php
similarity index 96%
rename from src/Dibi/Drivers/OdbcResult.php
rename to src/Dibi/Drivers/ODBC/Result.php
index 1271eba7..5ae5aad9 100644
--- a/src/Dibi/Drivers/OdbcResult.php
+++ b/src/Dibi/Drivers/ODBC/Result.php
@@ -7,16 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\ODBC;
 
 use Dibi;
+use Dibi\Drivers;
 use function is_resource;
 
 
 /**
  * The driver interacting with result set via ODBC connections.
  */
-class OdbcResult implements Result
+class Result implements Drivers\Result
 {
 	private int $row = 0;
 
diff --git a/src/Dibi/Drivers/PdoDriver.php b/src/Dibi/Drivers/PDO/Connection.php
similarity index 91%
rename from src/Dibi/Drivers/PdoDriver.php
rename to src/Dibi/Drivers/PDO/Connection.php
index 5ae38d49..56223a5c 100644
--- a/src/Dibi/Drivers/PdoDriver.php
+++ b/src/Dibi/Drivers/PDO/Connection.php
@@ -7,9 +7,11 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PDO;
 
 use Dibi;
+use Dibi\Drivers;
+use Dibi\Drivers\Engines;
 use Dibi\Helpers;
 use PDO;
 use function sprintf;
@@ -25,7 +27,7 @@
  *   - options (array) => driver specific options {@see PDO::__construct}
  *   - resource (PDO) => existing connection
  */
-class PdoDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	private ?PDO $connection;
 	private ?int $affectedRows;
@@ -94,10 +96,10 @@ public function query(string $sql): ?Result
 		$code ??= 0;
 		$message = "SQLSTATE[$sqlState]: $message";
 		throw match ($this->driverName) {
-			'mysql' => MySqliDriver::createException($message, $code, $sql),
-			'oci' => OracleDriver::createException($message, $code, $sql),
-			'pgsql' => PostgreDriver::createException($message, $sqlState, $sql),
-			'sqlite' => SqliteDriver::createException($message, $code, $sql),
+			'mysql' => Drivers\MySQLi\Connection::createException($message, $code, $sql),
+			'oci' => Drivers\OCI8\Connection::createException($message, $code, $sql),
+			'pgsql' => Drivers\PgSQL\Connection::createException($message, $sqlState, $sql),
+			'sqlite' => Drivers\SQLite3\Connection::createException($message, $code, $sql),
 			default => new Dibi\DriverException($message, $code, $sql),
 		};
 	}
@@ -172,14 +174,14 @@ public function getResource(): ?PDO
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
 		return match ($this->driverName) {
-			'mysql' => new MySqlReflector($this),
-			'oci' => new OracleReflector($this),
-			'pgsql' => new PostgreReflector($this),
-			'sqlite' => new SqliteReflector($this),
-			'mssql', 'dblib', 'sqlsrv' => new SqlsrvReflector($this),
+			'mysql' => new Engines\MySQLEngine($this),
+			'oci' => new Engines\OracleEngine($this),
+			'pgsql' => new Engines\PostgreSQLEngine($this),
+			'sqlite' => new Engines\SQLiteEngine($this),
+			'mssql', 'dblib', 'sqlsrv' => new Engines\SQLServerEngine($this),
 			default => throw new Dibi\NotSupportedException,
 		};
 	}
@@ -188,9 +190,9 @@ public function getReflector(): Engine
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\PDOStatement $result): PdoResult
+	public function createResultDriver(\PDOStatement $result): Result
 	{
-		return new PdoResult($result, $this->driverName);
+		return new Result($result, $this->driverName);
 	}
 
 
diff --git a/src/Dibi/Drivers/PdoResult.php b/src/Dibi/Drivers/PDO/Result.php
similarity index 96%
rename from src/Dibi/Drivers/PdoResult.php
rename to src/Dibi/Drivers/PDO/Result.php
index 886f116b..9365c4c4 100644
--- a/src/Dibi/Drivers/PdoResult.php
+++ b/src/Dibi/Drivers/PDO/Result.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PDO;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PDO;
 
@@ -17,7 +18,7 @@
 /**
  * The driver for PDO result set.
  */
-class PdoResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		private ?\PDOStatement $resultSet,
diff --git a/src/Dibi/Drivers/PostgreDriver.php b/src/Dibi/Drivers/PgSQL/Connection.php
similarity index 96%
rename from src/Dibi/Drivers/PostgreDriver.php
rename to src/Dibi/Drivers/PgSQL/Connection.php
index 7797d727..bda2b66f 100644
--- a/src/Dibi/Drivers/PostgreDriver.php
+++ b/src/Dibi/Drivers/PgSQL/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PgSQL;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PgSql;
 use function in_array, is_array, is_resource, strlen;
@@ -27,7 +28,7 @@
  *   - resource (PgSql\Connection) => existing connection resource
  *   - connect_type (int) => see pg_connect()
  */
-class PostgreDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	private PgSql\Connection $connection;
 	private ?int $affectedRows;
@@ -232,18 +233,18 @@ public function getResource(): PgSql\Connection
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new PostgreReflector($this);
+		return new Drivers\Engines\PostgreSQLEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(PgSql\Result $resource): PostgreResult
+	public function createResultDriver(PgSql\Result $resource): Result
 	{
-		return new PostgreResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/PostgreResult.php b/src/Dibi/Drivers/PgSQL/Result.php
similarity index 95%
rename from src/Dibi/Drivers/PostgreResult.php
rename to src/Dibi/Drivers/PgSQL/Result.php
index 96b9d750..92553fe7 100644
--- a/src/Dibi/Drivers/PostgreResult.php
+++ b/src/Dibi/Drivers/PgSQL/Result.php
@@ -7,8 +7,9 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\PgSQL;
 
+use Dibi\Drivers;
 use Dibi\Helpers;
 use PgSql;
 
@@ -16,7 +17,7 @@
 /**
  * The driver for PostgreSQL result set.
  */
-class PostgreResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		private readonly PgSql\Result $resultSet,
diff --git a/src/Dibi/Drivers/SqlsrvDriver.php b/src/Dibi/Drivers/SQLSrv/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/SqlsrvDriver.php
rename to src/Dibi/Drivers/SQLSrv/Connection.php
index 383a9eb0..e5b3953a 100644
--- a/src/Dibi/Drivers/SqlsrvDriver.php
+++ b/src/Dibi/Drivers/SQLSrv/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLSrv;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use function is_resource, sprintf;
 
@@ -26,7 +27,7 @@
  *   - charset => character encoding to set (default is UTF-8)
  *   - resource (resource) => existing connection resource
  */
-class SqlsrvDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	/** @var resource */
 	private $connection;
@@ -171,9 +172,9 @@ public function getResource(): mixed
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new SqlsrvReflector($this);
+		return new Drivers\Engines\SQLServerEngine($this);
 	}
 
 
@@ -181,9 +182,9 @@ public function getReflector(): Engine
 	 * Result set driver factory.
 	 * @param  resource  $resource
 	 */
-	public function createResultDriver($resource): SqlsrvResult
+	public function createResultDriver($resource): Result
 	{
-		return new SqlsrvResult($resource);
+		return new Result($resource);
 	}
 
 
diff --git a/src/Dibi/Drivers/SqlsrvResult.php b/src/Dibi/Drivers/SQLSrv/Result.php
similarity index 95%
rename from src/Dibi/Drivers/SqlsrvResult.php
rename to src/Dibi/Drivers/SQLSrv/Result.php
index 2180d1bb..c9e91b88 100644
--- a/src/Dibi/Drivers/SqlsrvResult.php
+++ b/src/Dibi/Drivers/SQLSrv/Result.php
@@ -7,16 +7,17 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLSrv;
 
 use Dibi;
+use Dibi\Drivers;
 use function is_resource;
 
 
 /**
  * The driver for Microsoft SQL Server and SQL Azure result set.
  */
-class SqlsrvResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		/** @var resource */
diff --git a/src/Dibi/Drivers/SqliteDriver.php b/src/Dibi/Drivers/SQLite3/Connection.php
similarity index 95%
rename from src/Dibi/Drivers/SqliteDriver.php
rename to src/Dibi/Drivers/SQLite3/Connection.php
index dab671a2..0391d7fa 100644
--- a/src/Dibi/Drivers/SqliteDriver.php
+++ b/src/Dibi/Drivers/SQLite3/Connection.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLite3;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use SQLite3;
 
@@ -23,7 +24,7 @@
  *   - formatDateTime => how to format datetime in SQL (@see date)
  *   - resource (SQLite3) => existing connection resource
  */
-class SqliteDriver implements Connection
+class Connection implements Drivers\Connection
 {
 	private SQLite3 $connection;
 	private string $fmtDate;
@@ -174,18 +175,18 @@ public function getResource(): ?SQLite3
 	/**
 	 * Returns the connection reflector.
 	 */
-	public function getReflector(): Engine
+	public function getReflector(): Drivers\Engine
 	{
-		return new SqliteReflector($this);
+		return new Drivers\Engines\SQLiteEngine($this);
 	}
 
 
 	/**
 	 * Result set driver factory.
 	 */
-	public function createResultDriver(\SQLite3Result $result): SqliteResult
+	public function createResultDriver(\SQLite3Result $result): Result
 	{
-		return new SqliteResult($result);
+		return new Result($result);
 	}
 
 
diff --git a/src/Dibi/Drivers/SqliteResult.php b/src/Dibi/Drivers/SQLite3/Result.php
similarity index 96%
rename from src/Dibi/Drivers/SqliteResult.php
rename to src/Dibi/Drivers/SQLite3/Result.php
index 04df4a53..cf89a9db 100644
--- a/src/Dibi/Drivers/SqliteResult.php
+++ b/src/Dibi/Drivers/SQLite3/Result.php
@@ -7,9 +7,10 @@
 
 declare(strict_types=1);
 
-namespace Dibi\Drivers;
+namespace Dibi\Drivers\SQLite3;
 
 use Dibi;
+use Dibi\Drivers;
 use Dibi\Helpers;
 use const SQLITE3_ASSOC, SQLITE3_BLOB, SQLITE3_FLOAT, SQLITE3_INTEGER, SQLITE3_NULL, SQLITE3_NUM, SQLITE3_TEXT;
 
@@ -17,7 +18,7 @@
 /**
  * The driver for SQLite result set.
  */
-class SqliteResult implements Result
+class Result implements Drivers\Result
 {
 	public function __construct(
 		private readonly \SQLite3Result $resultSet,
diff --git a/src/Dibi/Drivers/Sqlite3Driver.php b/src/Dibi/Drivers/Sqlite3Driver.php
deleted file mode 100644
index 0a99af83..00000000
--- a/src/Dibi/Drivers/Sqlite3Driver.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-
-/**
- * Alias for SqliteDriver driver.
- */
-class Sqlite3Driver extends SqliteDriver
-{
-}
diff --git a/src/Dibi/Drivers/Sqlite3Result.php b/src/Dibi/Drivers/Sqlite3Result.php
deleted file mode 100644
index f3ee1dd3..00000000
--- a/src/Dibi/Drivers/Sqlite3Result.php
+++ /dev/null
@@ -1,18 +0,0 @@
-<?php
-
-/**
- * This file is part of the Dibi, smart database abstraction layer (https://dibi.nette.org)
- * Copyright (c) 2005 David Grudl (https://davidgrudl.com)
- */
-
-declare(strict_types=1);
-
-namespace Dibi\Drivers;
-
-
-/**
- * Alias for SqliteResult driver.
- */
-class Sqlite3Result extends SqliteResult
-{
-}
diff --git a/tests/dibi/Fluent.fetch.limit.mssql.phpt b/tests/dibi/Fluent.fetch.limit.mssql.phpt
index cc358042..cc8fdc36 100644
--- a/tests/dibi/Fluent.fetch.limit.mssql.phpt
+++ b/tests/dibi/Fluent.fetch.limit.mssql.phpt
@@ -2,12 +2,14 @@
 
 declare(strict_types=1);
 
+use Dibi\Drivers\SQLSrv\Connection;
+use Dibi\Drivers\SQLSrv\Result;
 use Tester\Assert;
 
 require __DIR__ . '/bootstrap.php';
 
 
-class MockDriver extends Dibi\Drivers\SqlsrvDriver
+class MockDriver extends Connection
 {
 	public function __construct()
 	{
@@ -19,14 +21,14 @@ class MockDriver extends Dibi\Drivers\SqlsrvDriver
 	}
 
 
-	public function query(string $sql): ?Dibi\Drivers\Result
+	public function query(string $sql): ?Result
 	{
 		return new MockResult;
 	}
 }
 
 
-class MockResult extends Dibi\Drivers\SqlsrvResult
+class MockResult extends Result
 {
 	public function __construct()
 	{
diff --git a/tests/dibi/PdoDriver.providedConnection.phpt b/tests/dibi/PdoDriver.providedConnection.phpt
index eb524323..7492294d 100644
--- a/tests/dibi/PdoDriver.providedConnection.phpt
+++ b/tests/dibi/PdoDriver.providedConnection.phpt
@@ -14,7 +14,7 @@ function buildPdoDriver(?int $errorMode)
 		$pdo->setAttribute(PDO::ATTR_ERRMODE, $errorMode);
 	}
 
-	new Dibi\Drivers\PdoDriver(['resource' => $pdo]);
+	new Dibi\Drivers\PDO\Connection(['resource' => $pdo]);
 }
 
 

From 439f6d2f6d46889718fce03aa5d770fbe096089f Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Tue, 3 Sep 2024 18:10:42 +0200
Subject: [PATCH 5/7] drivers: escape*() methods moved to Engine [WIP]

---
 src/Dibi/Connection.php                       |  12 +-
 src/Dibi/DataSource.php                       |   2 +-
 src/Dibi/Drivers/Connection.php               |  20 ---
 src/Dibi/Drivers/Engine.php                   |  20 +++
 src/Dibi/Drivers/Engines/FirebirdEngine.php   |  53 ++++++
 src/Dibi/Drivers/Engines/MySQLEngine.php      |  64 ++++++-
 src/Dibi/Drivers/Engines/ODBCEngine.php       |  57 +++++++
 src/Dibi/Drivers/Engines/OracleEngine.php     |  66 +++++++
 src/Dibi/Drivers/Engines/PostgreSQLEngine.php |  69 +++++++-
 src/Dibi/Drivers/Engines/SQLServerEngine.php  |  59 +++++++
 src/Dibi/Drivers/Engines/SQLiteEngine.php     |  64 ++++++-
 src/Dibi/Drivers/Firebird/Connection.php      |  52 ------
 src/Dibi/Drivers/MySQLi/Connection.php        |  60 -------
 src/Dibi/Drivers/OCI8/Connection.php          |  66 -------
 src/Dibi/Drivers/ODBC/Connection.php          |  57 -------
 src/Dibi/Drivers/PDO/Connection.php           | 161 ------------------
 src/Dibi/Drivers/PgSQL/Connection.php         |  62 -------
 src/Dibi/Drivers/SQLSrv/Connection.php        |  59 -------
 src/Dibi/Drivers/SQLite3/Connection.php       |  55 ------
 src/Dibi/Translator.php                       |  34 ++--
 tests/dibi/Connection.objectTranslator.phpt   |  10 +-
 21 files changed, 478 insertions(+), 624 deletions(-)

diff --git a/src/Dibi/Connection.php b/src/Dibi/Connection.php
index e7e430b9..c7e24f5d 100644
--- a/src/Dibi/Connection.php
+++ b/src/Dibi/Connection.php
@@ -42,6 +42,7 @@ class Connection
 	/** @var string[]  resultset formats */
 	private array $formats;
 	private ?Drivers\Connection $driver = null;
+	private Drivers\Engine $engine;
 	private ?Translator $translator = null;
 
 	/** @var array<string, callable(object): Expression | null> */
@@ -670,6 +671,15 @@ public function loadFile(string $file, ?callable $onProgress = null): int
 	}
 
 
+	public function getDatabaseEngine(): Drivers\Engine
+	{
+		if (!$this->driver) { // TODO
+			$this->connect();
+		}
+		return $this->engine ??= $this->driver->getReflector();
+	}
+
+
 	/**
 	 * Gets a information about the current database.
 	 */
@@ -679,7 +689,7 @@ public function getDatabaseInfo(): Reflection\Database
 			$this->connect();
 		}
 
-		return new Reflection\Database($this->driver->getReflector(), $this->config['database'] ?? null);
+		return new Reflection\Database($this->getDatabaseEngine(), $this->config['database'] ?? null);
 	}
 
 
diff --git a/src/Dibi/DataSource.php b/src/Dibi/DataSource.php
index 1ecc0ec5..c2c6d9a5 100644
--- a/src/Dibi/DataSource.php
+++ b/src/Dibi/DataSource.php
@@ -35,7 +35,7 @@ class DataSource implements IDataSource
 	public function __construct(string $sql, Connection $connection)
 	{
 		$this->sql = strpbrk($sql, " \t\r\n") === false
-			? $connection->getDriver()->escapeIdentifier($sql) // table name
+			? $connection->getDatabaseEngine()->escapeIdentifier($sql) // table name
 			: '(' . $sql . ') t'; // SQL command
 		$this->connection = $connection;
 	}
diff --git a/src/Dibi/Drivers/Connection.php b/src/Dibi/Drivers/Connection.php
index 18f967db..6549e57f 100644
--- a/src/Dibi/Drivers/Connection.php
+++ b/src/Dibi/Drivers/Connection.php
@@ -74,24 +74,4 @@ function getReflector(): Engine;
 	function escapeText(string $value): string;
 
 	function escapeBinary(string $value): string;
-
-	function escapeIdentifier(string $value): string;
-
-	function escapeBool(bool $value): string;
-
-	function escapeDate(\DateTimeInterface $value): string;
-
-	function escapeDateTime(\DateTimeInterface $value): string;
-
-	function escapeDateInterval(\DateInterval $value): string;
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	function escapeLike(string $value, int $pos): string;
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
 }
diff --git a/src/Dibi/Drivers/Engine.php b/src/Dibi/Drivers/Engine.php
index ad3863f5..75c25463 100644
--- a/src/Dibi/Drivers/Engine.php
+++ b/src/Dibi/Drivers/Engine.php
@@ -15,6 +15,26 @@
  */
 interface Engine
 {
+	function escapeIdentifier(string $value): string;
+
+	function escapeBool(bool $value): string;
+
+	function escapeDate(\DateTimeInterface $value): string;
+
+	function escapeDateTime(\DateTimeInterface $value): string;
+
+	function escapeDateInterval(\DateInterval $value): string;
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	function escapeLike(string $value, int $pos): string;
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	function applyLimit(string &$sql, ?int $limit, ?int $offset): void;
+
 	/**
 	 * Returns list of tables.
 	 * @return array of {name [, (bool) view ]}
diff --git a/src/Dibi/Drivers/Engines/FirebirdEngine.php b/src/Dibi/Drivers/Engines/FirebirdEngine.php
index 3ad6d951..0c24b166 100644
--- a/src/Dibi/Drivers/Engines/FirebirdEngine.php
+++ b/src/Dibi/Drivers/Engines/FirebirdEngine.php
@@ -9,6 +9,7 @@
 
 namespace Dibi\Drivers\Engines;
 
+use Dibi;
 use Dibi\Drivers\Connection;
 use Dibi\Drivers\Engine;
 
@@ -24,6 +25,58 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return "'" . substr($value->format('Y-m-d H:i:s.u'), 0, -2) . "'";
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes($this->driver->escapeText($value), '%_\\');
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit > 0 || $offset > 0) {
+			// http://www.firebirdsql.org/refdocs/langrefupd20-select.html
+			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . $limit : '') . ($offset > 0 ? ' SKIP ' . $offset : '') . ' * FROM (' . $sql . ')';
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
diff --git a/src/Dibi/Drivers/Engines/MySQLEngine.php b/src/Dibi/Drivers/Engines/MySQLEngine.php
index 722a7847..1db5491b 100644
--- a/src/Dibi/Drivers/Engines/MySQLEngine.php
+++ b/src/Dibi/Drivers/Engines/MySQLEngine.php
@@ -26,6 +26,66 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		return '`' . str_replace('`', '``', $value) . '`';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d H:i:s.u'");
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		if ($value->y || $value->m || $value->d) {
+			throw new Dibi\NotSupportedException('Only time interval is supported.');
+		}
+
+		return $value->format("'%r%H:%I:%S.%f'");
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null || $offset) {
+			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
+			$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
+				. ($offset ? ' OFFSET ' . $offset : '');
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
@@ -49,7 +109,7 @@ public function getTables(): array
 	 */
 	public function getColumns(string $table): array
 	{
-		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->driver->escapeIdentifier($table)}");
+		$res = $this->driver->query("SHOW FULL COLUMNS FROM {$this->escapeIdentifier($table)}");
 		$columns = [];
 		while ($row = $res->fetch(true)) {
 			$type = explode('(', $row['Type']);
@@ -74,7 +134,7 @@ public function getColumns(string $table): array
 	 */
 	public function getIndexes(string $table): array
 	{
-		$res = $this->driver->query("SHOW INDEX FROM {$this->driver->escapeIdentifier($table)}");
+		$res = $this->driver->query("SHOW INDEX FROM {$this->escapeIdentifier($table)}");
 		$indexes = [];
 		while ($row = $res->fetch(true)) {
 			$indexes[$row['Key_name']]['name'] = $row['Key_name'];
diff --git a/src/Dibi/Drivers/Engines/ODBCEngine.php b/src/Dibi/Drivers/Engines/ODBCEngine.php
index 35ed5b06..3a3ad1d3 100644
--- a/src/Dibi/Drivers/Engines/ODBCEngine.php
+++ b/src/Dibi/Drivers/Engines/ODBCEngine.php
@@ -25,6 +25,63 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format('#m/d/Y#');
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format($this->microseconds ? '#m/d/Y H:i:s.u#' : '#m/d/Y H:i:s#'); // TODO
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($offset) {
+			throw new Dibi\NotSupportedException('Offset is not supported by this database.');
+
+		} elseif ($limit < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null) {
+			$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
diff --git a/src/Dibi/Drivers/Engines/OracleEngine.php b/src/Dibi/Drivers/Engines/OracleEngine.php
index 3fa723e3..620b1552 100644
--- a/src/Dibi/Drivers/Engines/OracleEngine.php
+++ b/src/Dibi/Drivers/Engines/OracleEngine.php
@@ -25,6 +25,72 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		// @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $this->nativeDate // TODO
+			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
+			: $value->format('U');
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $this->nativeDate // TODO
+			? "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')"
+			: $value->format('U');
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
+		$value = str_replace("'", "''", $value);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($offset) {
+			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
+			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
+				. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
+				. ') WHERE "__rnum" > ' . $offset;
+
+		} elseif ($limit !== null) {
+			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
diff --git a/src/Dibi/Drivers/Engines/PostgreSQLEngine.php b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
index 5622c8c7..338be739 100644
--- a/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
+++ b/src/Dibi/Drivers/Engines/PostgreSQLEngine.php
@@ -9,6 +9,7 @@
 
 namespace Dibi\Drivers\Engines;
 
+use Dibi;
 use Dibi\Drivers\Connection;
 use Dibi\Drivers\Engine;
 
@@ -24,6 +25,68 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
+		return '"' . str_replace('"', '""', $value) . '"';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? 'TRUE' : 'FALSE';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d H:i:s.u'");
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$bs = $this->driver->escapeText('\\'); // standard_conforming_strings = on/off
+		$value = $this->driver->escapeText($value);
+		$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+		}
+
+		if ($limit !== null) {
+			$sql .= ' LIMIT ' . $limit;
+		}
+
+		if ($offset) {
+			$sql .= ' OFFSET ' . $offset;
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
@@ -64,7 +127,7 @@ public function getTables(): array
 	 */
 	public function getColumns(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
 
 		$res = $this->driver->query("
 			SELECT *
@@ -124,7 +187,7 @@ public function getColumns(string $table): array
 	 */
 	public function getIndexes(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
 		$res = $this->driver->query("
 			SELECT
 				a.attnum AS ordinal_position,
@@ -174,7 +237,7 @@ public function getIndexes(string $table): array
 	 */
 	public function getForeignKeys(string $table): array
 	{
-		$_table = $this->driver->escapeText($this->driver->escapeIdentifier($table));
+		$_table = $this->driver->escapeText($this->escapeIdentifier($table));
 
 		$res = $this->driver->query("
 			SELECT
diff --git a/src/Dibi/Drivers/Engines/SQLServerEngine.php b/src/Dibi/Drivers/Engines/SQLServerEngine.php
index 0b6035ef..ff1b620a 100644
--- a/src/Dibi/Drivers/Engines/SQLServerEngine.php
+++ b/src/Dibi/Drivers/Engines/SQLServerEngine.php
@@ -25,6 +25,65 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		// @see https://msdn.microsoft.com/en-us/library/ms176027.aspx
+		return '[' . str_replace(']', ']]', $value) . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format("'Y-m-d'");
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null) {
+			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
+		} elseif ($offset) {
+			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
+			$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
diff --git a/src/Dibi/Drivers/Engines/SQLiteEngine.php b/src/Dibi/Drivers/Engines/SQLiteEngine.php
index f556081f..703c03df 100644
--- a/src/Dibi/Drivers/Engines/SQLiteEngine.php
+++ b/src/Dibi/Drivers/Engines/SQLiteEngine.php
@@ -9,6 +9,7 @@
 
 namespace Dibi\Drivers\Engines;
 
+use Dibi;
 use Dibi\Drivers\Connection;
 use Dibi\Drivers\Engine;
 
@@ -24,6 +25,61 @@ public function __construct(
 	}
 
 
+	public function escapeIdentifier(string $value): string
+	{
+		return '[' . strtr($value, '[]', '  ') . ']';
+	}
+
+
+	public function escapeBool(bool $value): string
+	{
+		return $value ? '1' : '0';
+	}
+
+
+	public function escapeDate(\DateTimeInterface $value): string
+	{
+		return $value->format($this->fmtDate); // TODO
+	}
+
+
+	public function escapeDateTime(\DateTimeInterface $value): string
+	{
+		return $value->format($this->fmtDateTime); // TODO
+	}
+
+
+	public function escapeDateInterval(\DateInterval $value): string
+	{
+		throw new Dibi\NotImplementedException;
+	}
+
+
+	/**
+	 * Encodes string for use in a LIKE statement.
+	 */
+	public function escapeLike(string $value, int $pos): string
+	{
+		$value = addcslashes($this->driver->escapeText($value), '%_\\');
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
+	}
+
+
+	/**
+	 * Injects LIMIT/OFFSET to the SQL query.
+	 */
+	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
+	{
+		if ($limit < 0 || $offset < 0) {
+			throw new Dibi\NotSupportedException('Negative offset or limit.');
+
+		} elseif ($limit !== null || $offset) {
+			$sql .= ' LIMIT ' . ($limit ?? '-1')
+				. ($offset ? ' OFFSET ' . $offset : '');
+		}
+	}
+
+
 	/**
 	 * Returns list of tables.
 	 */
@@ -49,7 +105,7 @@ public function getTables(): array
 	 */
 	public function getColumns(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA table_info({$this->driver->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA table_info({$this->escapeIdentifier($table)})");
 		$columns = [];
 		while ($row = $res->fetch(true)) {
 			$column = $row['name'];
@@ -76,7 +132,7 @@ public function getColumns(string $table): array
 	 */
 	public function getIndexes(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA index_list({$this->driver->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA index_list({$this->escapeIdentifier($table)})");
 		$indexes = [];
 		while ($row = $res->fetch(true)) {
 			$indexes[$row['name']]['name'] = $row['name'];
@@ -84,7 +140,7 @@ public function getIndexes(string $table): array
 		}
 
 		foreach ($indexes as $index => $values) {
-			$res = $this->driver->query("PRAGMA index_info({$this->driver->escapeIdentifier($index)})");
+			$res = $this->driver->query("PRAGMA index_info({$this->escapeIdentifier($index)})");
 			while ($row = $res->fetch(true)) {
 				$indexes[$index]['columns'][$row['seqno']] = $row['name'];
 			}
@@ -127,7 +183,7 @@ public function getIndexes(string $table): array
 	 */
 	public function getForeignKeys(string $table): array
 	{
-		$res = $this->driver->query("PRAGMA foreign_key_list({$this->driver->escapeIdentifier($table)})");
+		$res = $this->driver->query("PRAGMA foreign_key_list({$this->escapeIdentifier($table)})");
 		$keys = [];
 		while ($row = $res->fetch(true)) {
 			$keys[$row['id']]['name'] = $row['id']; // foreign key name
diff --git a/src/Dibi/Drivers/Firebird/Connection.php b/src/Dibi/Drivers/Firebird/Connection.php
index 72490511..37f8b30b 100644
--- a/src/Dibi/Drivers/Firebird/Connection.php
+++ b/src/Dibi/Drivers/Firebird/Connection.php
@@ -233,56 +233,4 @@ public function escapeBinary(string $value): string
 	{
 		return "'" . str_replace("'", "''", $value) . "'";
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return "'" . substr($value->format('Y-m-d H:i:s.u'), 0, -2) . "'";
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes($this->escapeText($value), '%_\\');
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit > 0 || $offset > 0) {
-			// http://www.firebirdsql.org/refdocs/langrefupd20-select.html
-			$sql = 'SELECT ' . ($limit > 0 ? 'FIRST ' . $limit : '') . ($offset > 0 ? ' SKIP ' . $offset : '') . ' * FROM (' . $sql . ')';
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/MySQLi/Connection.php b/src/Dibi/Drivers/MySQLi/Connection.php
index 05cf2bc3..04a8ea61 100644
--- a/src/Dibi/Drivers/MySQLi/Connection.php
+++ b/src/Dibi/Drivers/MySQLi/Connection.php
@@ -297,64 +297,4 @@ public function escapeBinary(string $value): string
 	{
 		return "_binary'" . $this->connection->escape_string($value) . "'";
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		return '`' . str_replace('`', '``', $value) . '`';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d H:i:s.u'");
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		if ($value->y || $value->m || $value->d) {
-			throw new Dibi\NotSupportedException('Only time interval is supported.');
-		}
-
-		return $value->format("'%r%H:%I:%S.%f'");
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null || $offset) {
-			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-			$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
-				. ($offset ? ' OFFSET ' . $offset : '');
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/OCI8/Connection.php b/src/Dibi/Drivers/OCI8/Connection.php
index 2eb5bc2b..46b022be 100644
--- a/src/Dibi/Drivers/OCI8/Connection.php
+++ b/src/Dibi/Drivers/OCI8/Connection.php
@@ -223,70 +223,4 @@ public function escapeBinary(string $value): string
 	{
 		return "'" . str_replace("'", "''", $value) . "'"; // TODO: not tested
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		// @see http://download.oracle.com/docs/cd/B10500_01/server.920/a96540/sql_elements9a.htm
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $this->nativeDate
-			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
-			: $value->format('U');
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $this->nativeDate
-			? "to_date('" . $value->format('Y-m-d G:i:s') . "', 'YYYY-mm-dd hh24:mi:ss')"
-			: $value->format('U');
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
-		$value = str_replace("'", "''", $value);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($offset) {
-			// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
-			$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
-				. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
-				. ') WHERE "__rnum" > ' . $offset;
-
-		} elseif ($limit !== null) {
-			$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/ODBC/Connection.php b/src/Dibi/Drivers/ODBC/Connection.php
index 8213cff5..b76863db 100644
--- a/src/Dibi/Drivers/ODBC/Connection.php
+++ b/src/Dibi/Drivers/ODBC/Connection.php
@@ -209,61 +209,4 @@ public function escapeBinary(string $value): string
 	{
 		return "'" . str_replace("'", "''", $value) . "'";
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format('#m/d/Y#');
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format($this->microseconds ? '#m/d/Y H:i:s.u#' : '#m/d/Y H:i:s#');
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($offset) {
-			throw new Dibi\NotSupportedException('Offset is not supported by this database.');
-
-		} elseif ($limit < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null) {
-			$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/PDO/Connection.php b/src/Dibi/Drivers/PDO/Connection.php
index 56223a5c..7e56a9d7 100644
--- a/src/Dibi/Drivers/PDO/Connection.php
+++ b/src/Dibi/Drivers/PDO/Connection.php
@@ -220,165 +220,4 @@ public function escapeBinary(string $value): string
 			default => $this->connection->quote($value, PDO::PARAM_LOB),
 		};
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		return match ($this->driverName) {
-			'mysql' => '`' . str_replace('`', '``', $value) . '`',
-			'oci', 'pgsql' => '"' . str_replace('"', '""', $value) . '"',
-			'sqlite' => '[' . strtr($value, '[]', '  ') . ']',
-			'odbc', 'mssql' => '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']',
-			'dblib', 'sqlsrv' => '[' . str_replace(']', ']]', $value) . ']',
-			default => $value,
-		};
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		if ($this->driverName === 'pgsql') {
-			return $value ? 'TRUE' : 'FALSE';
-		} else {
-			return $value ? '1' : '0';
-		}
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return match ($this->driverName) {
-			'odbc' => $value->format('#m/d/Y H:i:s.u#'),
-			'mssql', 'dblib', 'sqlsrv' => 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')',
-			default => $value->format("'Y-m-d H:i:s.u'"),
-		};
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		switch ($this->driverName) {
-			case 'mysql':
-				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
-				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-
-			case 'oci':
-				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
-				$value = str_replace("'", "''", $value);
-				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-
-			case 'pgsql':
-				$bs = substr($this->connection->quote('\\', PDO::PARAM_STR), 1, -1); // standard_conforming_strings = on/off
-				$value = substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1);
-				$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
-				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-
-			case 'sqlite':
-				$value = addcslashes(substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1), '%_\\');
-				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
-
-			case 'odbc':
-			case 'mssql':
-			case 'dblib':
-			case 'sqlsrv':
-				$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-
-			default:
-				throw new Dibi\NotImplementedException;
-		}
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-		}
-
-		switch ($this->driverName) {
-			case 'mysql':
-				if ($limit !== null || $offset) {
-					// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-					$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
-						. ($offset ? ' OFFSET ' . $offset : '');
-				}
-
-				break;
-
-			case 'pgsql':
-				if ($limit !== null) {
-					$sql .= ' LIMIT ' . $limit;
-				}
-
-				if ($offset) {
-					$sql .= ' OFFSET ' . $offset;
-				}
-
-				break;
-
-			case 'sqlite':
-				if ($limit !== null || $offset) {
-					$sql .= ' LIMIT ' . ($limit ?? '-1')
-						. ($offset ? ' OFFSET ' . $offset : '');
-				}
-
-				break;
-
-			case 'oci':
-				if ($offset) {
-					// see http://www.oracle.com/technology/oramag/oracle/06-sep/o56asktom.html
-					$sql = 'SELECT * FROM (SELECT t.*, ROWNUM AS "__rnum" FROM (' . $sql . ') t '
-						. ($limit !== null ? 'WHERE ROWNUM <= ' . ($offset + $limit) : '')
-						. ') WHERE "__rnum" > ' . $offset;
-
-				} elseif ($limit !== null) {
-					$sql = 'SELECT * FROM (' . $sql . ') WHERE ROWNUM <= ' . $limit;
-				}
-
-				break;
-
-			case 'mssql':
-			case 'sqlsrv':
-			case 'dblib':
-				// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-				if ($limit !== null) {
-					$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
-				} elseif ($offset) {
-					$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
-				}
-
-				break;
-
-			case 'odbc':
-				if ($offset) {
-					throw new Dibi\NotSupportedException('Offset is not supported by this database.');
-
-				} elseif ($limit !== null) {
-					$sql = 'SELECT TOP ' . $limit . ' * FROM (' . $sql . ') t';
-					break;
-				}
-				// break omitted
-			default:
-				throw new Dibi\NotSupportedException('PDO or driver does not support applying limit or offset.');
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/PgSQL/Connection.php b/src/Dibi/Drivers/PgSQL/Connection.php
index bda2b66f..cba724aa 100644
--- a/src/Dibi/Drivers/PgSQL/Connection.php
+++ b/src/Dibi/Drivers/PgSQL/Connection.php
@@ -272,66 +272,4 @@ public function escapeBinary(string $value): string
 
 		return "'" . pg_escape_bytea($this->connection, $value) . "'";
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		// @see http://www.postgresql.org/docs/8.2/static/sql-syntax-lexical.html#SQL-SYNTAX-IDENTIFIERS
-		return '"' . str_replace('"', '""', $value) . '"';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? 'TRUE' : 'FALSE';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d H:i:s.u'");
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$bs = pg_escape_string($this->connection, '\\'); // standard_conforming_strings = on/off
-		$value = pg_escape_string($this->connection, $value);
-		$value = strtr($value, ['%' => $bs . '%', '_' => $bs . '_', '\\' => '\\\\']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-		}
-
-		if ($limit !== null) {
-			$sql .= ' LIMIT ' . $limit;
-		}
-
-		if ($offset) {
-			$sql .= ' OFFSET ' . $offset;
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/SQLSrv/Connection.php b/src/Dibi/Drivers/SQLSrv/Connection.php
index e5b3953a..f38e297b 100644
--- a/src/Dibi/Drivers/SQLSrv/Connection.php
+++ b/src/Dibi/Drivers/SQLSrv/Connection.php
@@ -204,63 +204,4 @@ public function escapeBinary(string $value): string
 	{
 		return '0x' . bin2hex($value);
 	}
-
-
-	public function escapeIdentifier(string $value): string
-	{
-		// @see https://msdn.microsoft.com/en-us/library/ms176027.aspx
-		return '[' . str_replace(']', ']]', $value) . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format("'Y-m-d'");
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null) {
-			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-			$sql = sprintf('%s OFFSET %d ROWS FETCH NEXT %d ROWS ONLY', rtrim($sql), $offset, $limit);
-		} elseif ($offset) {
-			// requires ORDER BY, see https://technet.microsoft.com/en-us/library/gg699618(v=sql.110).aspx
-			$sql = sprintf('%s OFFSET %d ROWS', rtrim($sql), $offset);
-		}
-	}
 }
diff --git a/src/Dibi/Drivers/SQLite3/Connection.php b/src/Dibi/Drivers/SQLite3/Connection.php
index 0391d7fa..59693a56 100644
--- a/src/Dibi/Drivers/SQLite3/Connection.php
+++ b/src/Dibi/Drivers/SQLite3/Connection.php
@@ -208,61 +208,6 @@ public function escapeBinary(string $value): string
 	}
 
 
-	public function escapeIdentifier(string $value): string
-	{
-		return '[' . strtr($value, '[]', '  ') . ']';
-	}
-
-
-	public function escapeBool(bool $value): string
-	{
-		return $value ? '1' : '0';
-	}
-
-
-	public function escapeDate(\DateTimeInterface $value): string
-	{
-		return $value->format($this->fmtDate);
-	}
-
-
-	public function escapeDateTime(\DateTimeInterface $value): string
-	{
-		return $value->format($this->fmtDateTime);
-	}
-
-
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
-	/**
-	 * Encodes string for use in a LIKE statement.
-	 */
-	public function escapeLike(string $value, int $pos): string
-	{
-		$value = addcslashes($this->connection->escapeString($value), '%_\\');
-		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
-	}
-
-
-	/**
-	 * Injects LIMIT/OFFSET to the SQL query.
-	 */
-	public function applyLimit(string &$sql, ?int $limit, ?int $offset): void
-	{
-		if ($limit < 0 || $offset < 0) {
-			throw new Dibi\NotSupportedException('Negative offset or limit.');
-
-		} elseif ($limit !== null || $offset) {
-			$sql .= ' LIMIT ' . ($limit ?? '-1')
-				. ($offset ? ' OFFSET ' . $offset : '');
-		}
-	}
-
-
 	/********************* user defined functions ****************d*g**/
 
 
diff --git a/src/Dibi/Translator.php b/src/Dibi/Translator.php
index dca26a1a..5aa44c4c 100644
--- a/src/Dibi/Translator.php
+++ b/src/Dibi/Translator.php
@@ -17,8 +17,9 @@
  */
 final class Translator
 {
-	private Connection $connection;
+	private readonly Connection $connection;
 	private readonly Drivers\Connection $driver;
+	private readonly Drivers\Engine $engine;
 	private int $cursor = 0;
 	private array $args;
 
@@ -36,6 +37,7 @@ public function __construct(Connection $connection)
 	{
 		$this->connection = $connection;
 		$this->driver = $connection->getDriver();
+		$this->engine = $connection->getDatabaseEngine();
 		$this->identifiers = new HashMap($this->delimite(...));
 	}
 
@@ -144,7 +146,7 @@ public function translate(array $args): string
 
 		// apply limit
 		if ($this->limit !== null || $this->offset !== null) {
-			$this->driver->applyLimit($sql, $this->limit, $this->offset);
+			$this->engine->applyLimit($sql, $this->limit, $this->offset);
 		}
 
 		return $sql;
@@ -209,7 +211,7 @@ public function formatValue(mixed $value, ?string $modifier): string
 				case 'n':  // key, key, ... identifier names
 					foreach ($value as $k => $v) {
 						if (is_string($k)) {
-							$vx[] = $this->identifiers->$k . (empty($v) ? '' : ' AS ' . $this->driver->escapeIdentifier($v));
+							$vx[] = $this->identifiers->$k . (empty($v) ? '' : ' AS ' . $this->engine->escapeIdentifier($v));
 						} else {
 							$pair = explode('%', $v, 2); // split into identifier & modifier
 							$vx[] = $this->identifiers->{$pair[0]};
@@ -346,7 +348,7 @@ public function formatValue(mixed $value, ?string $modifier): string
 				case 's':  // string
 					return $value === null
 						? 'NULL'
-						: $this->driver->escapeText((string) $value);
+						: $this->engine->escapeText((string) $value);
 
 				case 'bin':// binary
 					return $value === null
@@ -356,7 +358,7 @@ public function formatValue(mixed $value, ?string $modifier): string
 				case 'b':  // boolean
 					return $value === null
 						? 'NULL'
-						: $this->driver->escapeBool((bool) $value);
+						: $this->engine->escapeBool((bool) $value);
 
 				case 'sN': // string or null
 				case 'sn':
@@ -406,15 +408,15 @@ public function formatValue(mixed $value, ?string $modifier): string
 					}
 
 					return $modifier === 'd'
-						? $this->driver->escapeDate($value)
-						: $this->driver->escapeDateTime($value);
+						? $this->engine->escapeDate($value)
+						: $this->engine->escapeDateTime($value);
 
 				case 'by':
 				case 'n':  // composed identifier name
 					return $this->identifiers->$value;
 
 				case 'N':  // identifier name
-					return $this->driver->escapeIdentifier($value);
+					return $this->engine->escapeIdentifier($value);
 
 				case 'ex':
 				case 'sql': // preserve as dibi-SQL  (TODO: leave only %ex)
@@ -450,16 +452,16 @@ public function formatValue(mixed $value, ?string $modifier): string
 					return (string) $value;
 
 				case 'like~':  // LIKE string%
-					return $this->driver->escapeLike($value, 2);
+					return $this->engine->escapeLike($value, 2);
 
 				case '~like':  // LIKE %string
-					return $this->driver->escapeLike($value, 1);
+					return $this->engine->escapeLike($value, 1);
 
 				case '~like~': // LIKE %string%
-					return $this->driver->escapeLike($value, 3);
+					return $this->engine->escapeLike($value, 3);
 
 				case 'like': // LIKE string
-					return $this->driver->escapeLike($value, 0);
+					return $this->engine->escapeLike($value, 0);
 
 				case 'and':
 				case 'or':
@@ -485,16 +487,16 @@ public function formatValue(mixed $value, ?string $modifier): string
 			return rtrim(rtrim(number_format($value, 10, '.', ''), '0'), '.');
 
 		} elseif (is_bool($value)) {
-			return $this->driver->escapeBool($value);
+			return $this->engine->escapeBool($value);
 
 		} elseif ($value === null) {
 			return 'NULL';
 
 		} elseif ($value instanceof \DateTimeInterface) {
-			return $this->driver->escapeDateTime($value);
+			return $this->engine->escapeDateTime($value);
 
 		} elseif ($value instanceof \DateInterval) {
-			return $this->driver->escapeDateInterval($value);
+			return $this->engine->escapeDateInterval($value);
 
 		} elseif ($value instanceof Literal) {
 			return (string) $value;
@@ -653,7 +655,7 @@ public function delimite(string $value): string
 		$parts = explode('.', $value);
 		foreach ($parts as &$v) {
 			if ($v !== '*') {
-				$v = $this->driver->escapeIdentifier($v);
+				$v = $this->engine->escapeIdentifier($v);
 			}
 		}
 
diff --git a/tests/dibi/Connection.objectTranslator.phpt b/tests/dibi/Connection.objectTranslator.phpt
index 32938af2..58e3be45 100644
--- a/tests/dibi/Connection.objectTranslator.phpt
+++ b/tests/dibi/Connection.objectTranslator.phpt
@@ -49,7 +49,7 @@ test('DateTime', function () use ($conn) {
 
 	// Without object translator, DateTime child is translated by driver
 	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
+		$conn->getDatabaseEngine()->escapeDateTime($stamp),
 		$conn->translate('?', $stamp),
 	);
 
@@ -67,15 +67,15 @@ test('DateTime', function () use ($conn) {
 
 	// With modifier, it is still translated by driver
 	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
+		$conn->getDatabaseEngine()->escapeDateTime($stamp),
 		$conn->translate('%dt', $stamp),
 	);
 	Assert::same(
-		$conn->getDriver()->escapeDateTime($stamp),
+		$conn->getDatabaseEngine()->escapeDateTime($stamp),
 		$conn->translate('%t', $stamp),
 	);
 	Assert::same(
-		$conn->getDriver()->escapeDate($stamp),
+		$conn->getDatabaseEngine()->escapeDate($stamp),
 		$conn->translate('%d', $stamp),
 	);
 
@@ -83,7 +83,7 @@ test('DateTime', function () use ($conn) {
 	// DateTimeImmutable as a Time parent is not affected and still translated by driver
 	$dt = DateTimeImmutable::createFromFormat('Y-m-d H:i:s', '2022-11-22 12:13:14');
 	Assert::same(
-		$conn->getDriver()->escapeDateTime($dt),
+		$conn->getDatabaseEngine()->escapeDateTime($dt),
 		$conn->translate('?', $dt),
 	);
 

From dc9486f61ba206fb66c41020b4564ca3e91187a3 Mon Sep 17 00:00:00 2001
From: David Grudl <david@grudl.com>
Date: Sat, 23 Nov 2024 17:59:08 +0100
Subject: [PATCH 6/7] used attribute Deprecated

---
 src/Dibi/Drivers/Firebird/Connection.php |  2 +-
 src/Dibi/Drivers/MySQLi/Connection.php   |  6 +++---
 src/Dibi/Fluent.php                      |  2 +-
 src/Dibi/Type.php                        | 18 +++++++++---------
 src/Dibi/dibi.php                        |  3 ---
 5 files changed, 14 insertions(+), 17 deletions(-)

diff --git a/src/Dibi/Drivers/Firebird/Connection.php b/src/Dibi/Drivers/Firebird/Connection.php
index 37f8b30b..1cdbe091 100644
--- a/src/Dibi/Drivers/Firebird/Connection.php
+++ b/src/Dibi/Drivers/Firebird/Connection.php
@@ -30,7 +30,7 @@ class Connection implements Drivers\Connection
 {
 	public const ErrorExceptionThrown = -836;
 
-	/** @deprecated use FirebirdDriver::ErrorExceptionThrown */
+	#[\Deprecated('use FirebirdDriver::ErrorExceptionThrown')]
 	public const ERROR_EXCEPTION_THROWN = self::ErrorExceptionThrown;
 
 	/** @var resource */
diff --git a/src/Dibi/Drivers/MySQLi/Connection.php b/src/Dibi/Drivers/MySQLi/Connection.php
index 04a8ea61..4eed92ab 100644
--- a/src/Dibi/Drivers/MySQLi/Connection.php
+++ b/src/Dibi/Drivers/MySQLi/Connection.php
@@ -39,13 +39,13 @@ class Connection implements Drivers\Connection
 	public const ErrorDuplicateEntry = 1062;
 	public const ErrorDataTruncated = 1265;
 
-	/** @deprecated use MySqliDriver::ErrorAccessDenied */
+	#[\Deprecated('use MySqliDriver::ErrorAccessDenied')]
 	public const ERROR_ACCESS_DENIED = self::ErrorAccessDenied;
 
-	/** @deprecated use MySqliDriver::ErrorDuplicateEntry */
+	#[\Deprecated('use MySqliDriver::ErrorDuplicateEntry')]
 	public const ERROR_DUPLICATE_ENTRY = self::ErrorDuplicateEntry;
 
-	/** @deprecated use MySqliDriver::ErrorDataTruncated */
+	#[\Deprecated('use MySqliDriver::ErrorDataTruncated')]
 	public const ERROR_DATA_TRUNCATED = self::ErrorDataTruncated;
 
 	private \mysqli $connection;
diff --git a/src/Dibi/Fluent.php b/src/Dibi/Fluent.php
index 3881fa0b..79b3c58f 100644
--- a/src/Dibi/Fluent.php
+++ b/src/Dibi/Fluent.php
@@ -52,7 +52,7 @@ class Fluent implements IDataSource
 		Identifier = 'n',
 		Remove = false;
 
-	/** @deprecated use Fluent::Remove */
+	#[\Deprecated('use Fluent::Remove')]
 	public const REMOVE = self::Remove;
 
 	public static array $masks = [
diff --git a/src/Dibi/Type.php b/src/Dibi/Type.php
index da0f49df..d98f2d78 100644
--- a/src/Dibi/Type.php
+++ b/src/Dibi/Type.php
@@ -27,31 +27,31 @@ class Type
 		Time = 't',
 		TimeInterval = 'ti';
 
-	/** @deprecated use Type::Text */
+	#[\Deprecated('use Type::Text')]
 	public const TEXT = self::Text;
 
-	/** @deprecated use Type::Binary */
+	#[\Deprecated('use Type::Binary')]
 	public const BINARY = self::Binary;
 
-	/** @deprecated use Type::Bool */
+	#[\Deprecated('use Type::Bool')]
 	public const BOOL = self::Bool;
 
-	/** @deprecated use Type::Integer */
+	#[\Deprecated('use Type::Integer')]
 	public const INTEGER = self::Integer;
 
-	/** @deprecated use Type::Float */
+	#[\Deprecated('use Type::Float')]
 	public const FLOAT = self::Float;
 
-	/** @deprecated use Type::Date */
+	#[\Deprecated('use Type::Date')]
 	public const DATE = self::Date;
 
-	/** @deprecated use Type::DateTime */
+	#[\Deprecated('use Type::DateTime')]
 	public const DATETIME = self::DateTime;
 
-	/** @deprecated use Type::Time */
+	#[\Deprecated('use Type::Time')]
 	public const TIME = self::Time;
 
-	/** @deprecated use Type::TimeInterval */
+	#[\Deprecated('use Type::TimeInterval')]
 	public const TIME_INTERVAL = self::TimeInterval;
 
 
diff --git a/src/Dibi/dibi.php b/src/Dibi/dibi.php
index c9c95c4e..90086ead 100644
--- a/src/Dibi/dibi.php
+++ b/src/Dibi/dibi.php
@@ -39,13 +39,10 @@ class dibi
 {
 	public const Version = '6.0-dev';
 
-	/** @deprecated use dibi::Version */
 	public const VERSION = self::Version;
 
-	/** @deprecated use Dibi\Fluent::AffectedRows */
 	public const AFFECTED_ROWS = Dibi\Fluent::AffectedRows;
 
-	/** @deprecated use Dibi\Fluent::Identifier */
 	public const IDENTIFIER = Dibi\Fluent::Identifier;
 
 	/** sorting order */

From 340376ab2b3602daf74917e39b1be9deeb6c959c Mon Sep 17 00:00:00 2001
From: "petr.gurth" <petr.gurth@siteone.cz>
Date: Fri, 28 Nov 2025 11:17:04 +0100
Subject: [PATCH 7/7] fix(oci8): Check for error after fetching data

---
 src/Dibi/Drivers/OCI8/Result.php | 17 ++++++++++++++++-
 1 file changed, 16 insertions(+), 1 deletion(-)

diff --git a/src/Dibi/Drivers/OCI8/Result.php b/src/Dibi/Drivers/OCI8/Result.php
index e9c5c584..c72aa414 100644
--- a/src/Dibi/Drivers/OCI8/Result.php
+++ b/src/Dibi/Drivers/OCI8/Result.php
@@ -41,7 +41,22 @@ public function getRowCount(): int
 	 */
 	public function fetch(bool $assoc): ?array
 	{
-		return Dibi\Helpers::false2Null(oci_fetch_array($this->resultSet, ($assoc ? OCI_ASSOC : OCI_NUM) | OCI_RETURN_NULLS));
+		$result = oci_fetch_array($this->resultSet, ($assoc ? OCI_ASSOC : OCI_NUM) | OCI_RETURN_NULLS);
+
+		/*
+		* Bug query example: SELECT (SELECT col FROM table WHERE ...) AS subcol FROM dual
+		*
+		* Oracle by default stream data per n rows (oci8.default_prefetch in php.ini, default is 100).
+		* 1) First 100 rows are fetched ok
+		* 2) In second fetch call there can be an error (e.g. "ORA-01427: single-row subquery returns more than one row")
+			in this case oci_fetch_all returns false so therefore we need to check for errors here
+		*/
+		$error = oci_error($this->resultSet); 
+		if ($error) {
+			throw new \Dibi\DriverException($error['message'], $error['code']); 
+		}
+
+		return Dibi\Helpers::false2Null($result);
 	}