Released version 5.0.2

- https://learn.microsoft.com/en-us/answers/questions/1853144/error-failed-to-initialize-container-mcr-microsoft
- https://learn.microsoft.com/en-us/sql/tools/sqlcmd/sqlcmd-utility?view=sql-server-ver16&tabs=go%2Cwindows&pivots=cs1-bash

.github/workflows/coding-style.yml

@@ -7,7 +7,7 @@ jobs:
         name: Nette Code Checker
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: 8.0
@@ -21,7 +21,7 @@ jobs:
         name: Nette Coding Standard
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: 8.0

.github/workflows/static-analysis.yml

@@ -10,7 +10,7 @@ jobs:
         name: PHPStan
         runs-on: ubuntu-latest
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: 8.0

.github/workflows/tests.yml

@@ -3,7 +3,7 @@ name: Tests
 on: [push, pull_request]
 
 env:
-    php-extensions: mbstring, intl, mysqli, pgsql, sqlsrv-5.10.0beta2, pdo_sqlsrv-5.10.0beta2
+    php-extensions: mbstring, intl, mysqli, pgsql, sqlsrv-5.12.0, pdo_sqlsrv-5.12.0
     php-tools: "composer:v2, pecl"
 
 jobs:
@@ -11,7 +11,7 @@ jobs:
         runs-on: ubuntu-latest
         strategy:
             matrix:
-                php: ['8.0', '8.1', '8.2', '8.3']
+                php: ['8.0', '8.1', '8.2', '8.3', '8.4']
 
             fail-fast: false
 
@@ -43,7 +43,6 @@ jobs:
                     --health-retries=5
                     -e MYSQL_ROOT_PASSWORD=root
                     -e MYSQL_DATABASE=dibi_test
-                    --entrypoint sh mysql:8 -c "exec docker-entrypoint.sh mysqld --default-authentication-plugin=mysql_native_password"
 
             postgres96:
                 image: postgres:9.6
@@ -83,13 +82,13 @@ jobs:
                     - 1433:1433
                 options: >-
                     --name=mssql
-                    --health-cmd "/opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1'"
+                    --health-cmd "/opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'SELECT 1' -N -C"
                     --health-interval 10s
                     --health-timeout 5s
                     --health-retries 5
 
         steps:
-            - uses: actions/checkout@v3
+            - uses: actions/checkout@v4
             - uses: shivammathur/setup-php@v2
               with:
                   php-version: ${{ matrix.php }}
@@ -101,7 +100,7 @@ jobs:
               run: cp ./tests/databases.github.ini ./tests/databases.ini
 
             - name: Create MS SQL Database
-              run: docker exec -i mssql /opt/mssql-tools/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE dibi_test'
+              run: docker exec -i mssql /opt/mssql-tools18/bin/sqlcmd -S localhost -U SA -P 'YourStrong!Passw0rd' -Q 'CREATE DATABASE dibi_test' -N -C
 
             - run: composer install --no-progress --prefer-dist
             - run: vendor/bin/tester -p phpdbg tests -s -C --coverage ./coverage.xml --coverage-src ./src

composer.json

@@ -11,7 +11,7 @@
 		}
 	],
 	"require": {
-		"php": "8.0 - 8.3"
+		"php": "8.0 - 8.4"
 	},
 	"require-dev": {
 		"tracy/tracy": "^2.9",
@@ -26,6 +26,7 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
+	"minimum-stability": "dev",
 	"scripts": {
 		"phpstan": "phpstan analyse",
 		"tester": "tester tests -s"

examples/result-set-data-types.php

@@ -27,9 +27,9 @@ $dibi = new Dibi\Connection([
 // using manual hints
 $res = $dibi->query('SELECT * FROM [customers]');
 
-$res->setType('customer_id', Type::INTEGER)
-	->setType('added', Type::DATETIME)
-	->setFormat(Type::DATETIME, 'Y-m-d H:i:s');
+$res->setType('customer_id', Type::Integer)
+	->setType('added', Type::DateTime)
+	->setFormat(Type::DateTime, 'Y-m-d H:i:s');
 
 
 Tracy\Dumper::dump($res->fetch());

readme.md

@@ -34,7 +34,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 5.0 requires PHP version 8.0 and supports PHP up to 8.3.
+The Dibi 5.0 requires PHP version 8.0 and supports PHP up to 8.4.
 
 
 Usage
@@ -608,7 +608,7 @@ $database->query("UPDATE [:blog:items] SET [text]='Hello World'");
 Dibi automatically detects the types of query columns and converts fields them to native PHP types. We can also specify the type manually. You can find the possible types in the `Dibi\Type` class.
 
 ```php
-$result->setType('id', Dibi\Type::INTEGER); // id will be integer
+$result->setType('id', Dibi\Type::Integer); // id will be integer
 $row = $result->fetch();
 
 is_int($row->id) // true

src/Dibi/Bridges/Nette/DibiExtension3.php

@@ -49,7 +49,7 @@ class DibiExtension3 extends Nette\DI\CompilerExtension
 				'formatDateTime' => Expect::string(),
 				'formatTimeInterval' => Expect::string(),
 				'formatJson' => Expect::string(),
-			]),
+			])->castTo('array'),
 		])->otherItems(Expect::type('mixed'))
 			->castTo('array');
 	}

src/Dibi/Bridges/Tracy/Panel.php

@@ -151,8 +151,8 @@ class Panel implements Tracy\IBarPanel
 			#tracy-debug .tracy-DibiProfiler-source { color: #999 !important }
 			#tracy-debug tracy-DibiProfiler tr table { margin: 8px 0; max-height: 150px; overflow:auto } </style>
 			<h1>Queries:' . "\u{a0}" . count($this->events)
-				. ($totalTime === null ? '' : ", time:\u{a0}" . number_format($totalTime * 1000, 1, '.', "\u{202f}") . "\u{202f}ms") . ', '
-				. htmlspecialchars($this->getConnectionName($singleConnection)) . '</h1>
+				. ($totalTime === null ? '' : ", time:\u{a0}" . number_format($totalTime * 1000, 1, '.', "\u{202f}") . "\u{202f}ms")
+				. ($singleConnection === null ? '' : ', ' . htmlspecialchars($this->getConnectionName($singleConnection))) . '</h1>
 			<div class="tracy-inner tracy-DibiProfiler">
 			<table class="tracy-sortable">
 				<tr><th>Time&nbsp;ms</th><th>SQL Statement</th><th>Rows</th>' . (!$singleConnection ? '<th>Connection</th>' : '') . '</tr>

src/Dibi/Connection.php

@@ -74,10 +74,10 @@ class Connection implements IConnection
 		$this->config = $config;
 
 		$this->formats = [
-			Type::DATE => $this->config['result']['formatDate'],
-			Type::DATETIME => $this->config['result']['formatDateTime'],
+			Type::Date => $this->config['result']['formatDate'],
+			Type::DateTime => $this->config['result']['formatDateTime'],
 			Type::JSON => $this->config['result']['formatJson'] ?? 'array',
-			Type::TIME_INTERVAL => $this->config['result']['formatTimeInterval'] ?? null,
+			Type::TimeInterval => $this->config['result']['formatTimeInterval'] ?? null,
 		];
 
 		// profiler

src/Dibi/Drivers/FirebirdDriver.php

@@ -26,7 +26,10 @@ use Dibi\Helpers;
  */
 class FirebirdDriver implements Dibi\Driver
 {
-	public const ERROR_EXCEPTION_THROWN = -836;
+	public const ErrorExceptionThrown = -836;
+
+	/** @deprecated use FirebirdDriver::ErrorExceptionThrown */
+	public const ERROR_EXCEPTION_THROWN = self::ErrorExceptionThrown;
 
 	/** @var resource */
 	private $connection;

src/Dibi/Drivers/MySqliDriver.php

@@ -32,9 +32,18 @@ use Dibi;
  */
 class MySqliDriver implements Dibi\Driver
 {
-	public const ERROR_ACCESS_DENIED = 1045;
-	public const ERROR_DUPLICATE_ENTRY = 1062;
-	public const ERROR_DATA_TRUNCATED = 1265;
+	public const ErrorAccessDenied = 1045;
+	public const ErrorDuplicateEntry = 1062;
+	public const ErrorDataTruncated = 1265;
+
+	/** @deprecated use MySqliDriver::ErrorAccessDenied */
+	public const ERROR_ACCESS_DENIED = self::ErrorAccessDenied;
+
+	/** @deprecated use MySqliDriver::ErrorDuplicateEntry */
+	public const ERROR_DUPLICATE_ENTRY = self::ErrorDuplicateEntry;
+
+	/** @deprecated use MySqliDriver::ErrorDataTruncated */
+	public const ERROR_DATA_TRUNCATED = self::ErrorDataTruncated;
 
 	private \mysqli $connection;
 	private bool $buffered = false;

src/Dibi/Drivers/MySqliResult.php

@@ -103,7 +103,7 @@ class MySqliResult implements Dibi\ResultDriver
 				'table' => $row['orgtable'],
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'nativetype' => $types[$row['type']] ?? $row['type'],
-				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TIME_INTERVAL : null,
+				'type' => $row['type'] === MYSQLI_TYPE_TIME ? Dibi\Type::TimeInterval : null,
 				'vendor' => $row,
 			];
 		}

src/Dibi/Drivers/OracleResult.php

@@ -80,7 +80,7 @@ class OracleResult implements Dibi\ResultDriver
 				'name' => oci_field_name($this->resultSet, $i),
 				'table' => null,
 				'fullname' => oci_field_name($this->resultSet, $i),
-				'type' => $type === 'LONG' ? Dibi\Type::TEXT : null,
+				'type' => $type === 'LONG' ? Dibi\Type::Text : null,
 				'nativetype' => $type === 'NUMBER' && oci_field_scale($this->resultSet, $i) === 0 ? 'INTEGER' : $type,
 			];
 		}

src/Dibi/Drivers/PdoDriver.php

@@ -176,27 +176,14 @@ class PdoDriver implements Dibi\Driver
 	 */
 	public function getReflector(): Dibi\Reflector
 	{
-		switch ($this->driverName) {
-			case 'mysql':
-				return new MySqlReflector($this);
-
-			case 'oci':
-				return new OracleReflector($this);
-
-			case 'pgsql':
-				return new PostgreReflector($this, $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION));
-
-			case 'sqlite':
-				return new SqliteReflector($this);
-
-			case 'mssql':
-			case 'dblib':
-			case 'sqlsrv':
-				return new SqlsrvReflector($this);
-
-			default:
-				throw new Dibi\NotSupportedException;
-		}
+		return match ($this->driverName) {
+			'mysql' => new MySqlReflector($this),
+			'oci' => new OracleReflector($this),
+			'pgsql' => new PostgreReflector($this, $this->connection->getAttribute(PDO::ATTR_SERVER_VERSION)),
+			'sqlite' => new SqliteReflector($this),
+			'mssql', 'dblib', 'sqlsrv' => new SqlsrvReflector($this),
+			default => throw new Dibi\NotSupportedException,
+		};
 	}
 
 
@@ -217,44 +204,34 @@ class PdoDriver implements Dibi\Driver
 	 */
 	public function escapeText(string $value): string
 	{
-		return $this->driverName === 'odbc'
-			? "'" . str_replace("'", "''", $value) . "'"
-			: $this->connection->quote($value, PDO::PARAM_STR);
+		return match ($this->driverName) {
+			'odbc' => "'" . str_replace("'", "''", $value) . "'",
+			'sqlsrv' => "N'" . str_replace("'", "''", $value) . "'",
+			default => $this->connection->quote($value, PDO::PARAM_STR),
+		};
 	}
 
 
 	public function escapeBinary(string $value): string
 	{
-		return $this->driverName === 'odbc'
-			? "'" . str_replace("'", "''", $value) . "'"
-			: $this->connection->quote($value, PDO::PARAM_LOB);
+		return match ($this->driverName) {
+			'odbc' => "'" . str_replace("'", "''", $value) . "'",
+			'sqlsrv' => '0x' . bin2hex($value),
+			default => $this->connection->quote($value, PDO::PARAM_LOB),
+		};
 	}
 
 
 	public function escapeIdentifier(string $value): string
 	{
-		switch ($this->driverName) {
-			case 'mysql':
-				return '`' . str_replace('`', '``', $value) . '`';
-
-			case 'oci':
-			case 'pgsql':
-				return '"' . str_replace('"', '""', $value) . '"';
-
-			case 'sqlite':
-				return '[' . strtr($value, '[]', '  ') . ']';
-
-			case 'odbc':
-			case 'mssql':
-				return '[' . str_replace(['[', ']'], ['[[', ']]'], $value) . ']';
-
-			case 'dblib':
-			case 'sqlsrv':
-				return '[' . str_replace(']', ']]', $value) . ']';
-
-			default:
-				return $value;
-		}
+		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,
+		};
 	}
 
 
@@ -276,16 +253,11 @@ class PdoDriver implements Dibi\Driver
 
 	public function escapeDateTime(\DateTimeInterface $value): string
 	{
-		switch ($this->driverName) {
-			case 'odbc':
-				return $value->format('#m/d/Y H:i:s.u#');
-			case 'mssql':
-			case 'dblib':
-			case 'sqlsrv':
-				return 'CONVERT(DATETIME2(7), ' . $value->format("'Y-m-d H:i:s.u'") . ')';
-			default:
-				return $value->format("'Y-m-d H:i:s.u'");
-		}
+		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'"),
+		};
 	}
 
 

src/Dibi/Drivers/PdoResult.php

@@ -90,7 +90,7 @@ class PdoResult implements Dibi\ResultDriver
 				'name' => $row['name'],
 				'table' => $row['table'],
 				'nativetype' => $row['native_type'],
-				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TIME_INTERVAL : null,
+				'type' => $row['native_type'] === 'TIME' && $this->driverName === 'mysql' ? Dibi\Type::TimeInterval : null,
 				'fullname' => $row['table'] ? $row['table'] . '.' . $row['name'] : $row['name'],
 				'vendor' => $row,
 			];

src/Dibi/Drivers/SqliteDriver.php

@@ -57,7 +57,6 @@ class SqliteDriver implements Dibi\Driver
 
 		// enable foreign keys support (defaultly disabled; if disabled then foreign key constraints are not enforced)
 		$version = SQLite3::version();
-		$this->connection->enableExceptions(false);
 		if ($version['versionNumber'] >= '3006019') {
 			$this->query('PRAGMA foreign_keys = ON');
 		}

src/Dibi/Fluent.php

@@ -45,7 +45,13 @@ namespace Dibi;
  */
 class Fluent implements IDataSource
 {
-	public const REMOVE = false;
+	public const
+		AffectedRows = 'a',
+		Identifier = 'n',
+		Remove = false;
+
+	/** @deprecated use Fluent::Remove */
+	public const REMOVE = self::Remove;
 
 	public static array $masks = [
 		'SELECT' => ['SELECT', 'DISTINCT', 'FROM', 'WHERE', 'GROUP BY',
@@ -140,7 +146,7 @@ class Fluent implements IDataSource
 			$this->cursor = &$this->clauses[$clause];
 
 			// TODO: really delete?
-			if ($args === [self::REMOVE]) {
+			if ($args === [self::Remove]) {
 				$this->cursor = null;
 				return $this;
 			}
@@ -156,7 +162,7 @@ class Fluent implements IDataSource
 			}
 		} else {
 			// append to currect flow
-			if ($args === [self::REMOVE]) {
+			if ($args === [self::Remove]) {
 				return $this;
 			}
 
@@ -279,15 +285,15 @@ class Fluent implements IDataSource
 	/**
 	 * Generates and executes SQL query.
 	 * Returns result set or number of affected rows
-	 * @return ($return is \dibi::IDENTIFIER|\dibi::AFFECTED_ROWS ? int : Result)
+	 * @return ($return is self::Identifier|self::AffectedRows ? int : Result)
 	 * @throws Exception
 	 */
 	public function execute(?string $return = null): Result|int|null
 	{
 		$res = $this->query($this->_export());
 		return match ($return) {
-			\dibi::IDENTIFIER => $this->connection->getInsertId(),
-			\dibi::AFFECTED_ROWS => $this->connection->getAffectedRows(),
+			self::Identifier => $this->connection->getInsertId(),
+			self::AffectedRows => $this->connection->getAffectedRows(),
 			default => $res,
 		};
 	}

src/Dibi/Helpers.php

@@ -159,12 +159,12 @@ class Helpers
 	public static function escape(Driver $driver, $value, string $type): string
 	{
 		$types = [
-			Type::TEXT => 'text',
-			Type::BINARY => 'binary',
-			Type::BOOL => 'bool',
-			Type::DATE => 'date',
-			Type::DATETIME => 'datetime',
-			\dibi::IDENTIFIER => 'identifier',
+			Type::Text => 'text',
+			Type::Binary => 'binary',
+			Type::Bool => 'bool',
+			Type::Date => 'date',
+			Type::DateTime => 'datetime',
+			Fluent::Identifier => 'identifier',
 		];
 		if (isset($types[$type])) {
 			return $driver->{'escape' . $types[$type]}($value);
@@ -181,16 +181,16 @@ class Helpers
 	public static function detectType(string $type): ?string
 	{
 		$patterns = [
-			'^_' => Type::TEXT, // PostgreSQL arrays
-			'RANGE$' => Type::TEXT, // PostgreSQL range types
-			'BYTEA|BLOB|BIN' => Type::BINARY,
-			'TEXT|CHAR|POINT|INTERVAL|STRING' => Type::TEXT,
-			'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT|^TINY$' => Type::INTEGER,
-			'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::FLOAT,
-			'^TIME$' => Type::TIME,
-			'TIME' => Type::DATETIME, // DATETIME, TIMESTAMP
-			'DATE' => Type::DATE,
-			'BOOL' => Type::BOOL,
+			'^_' => Type::Text, // PostgreSQL arrays
+			'RANGE$' => Type::Text, // PostgreSQL range types
+			'BYTEA|BLOB|BIN' => Type::Binary,
+			'TEXT|CHAR|POINT|INTERVAL|STRING' => Type::Text,
+			'YEAR|BYTE|COUNTER|SERIAL|INT|LONG|SHORT|^TINY$' => Type::Integer,
+			'CURRENCY|REAL|MONEY|FLOAT|DOUBLE|DECIMAL|NUMERIC|NUMBER' => Type::Float,
+			'^TIME$' => Type::Time,
+			'TIME' => Type::DateTime, // DATETIME, TIMESTAMP
+			'DATE' => Type::Date,
+			'BOOL' => Type::Bool,
 			'JSON' => Type::JSON,
 		];
 

src/Dibi/Result.php

@@ -457,16 +457,22 @@ class Result implements IDataSource
 			if ($type === null || $format === 'native') {
 				$row[$key] = $value;
 
-			} elseif ($type === Type::TEXT) {
+			} elseif ($type === Type::Text) {
 				$row[$key] = (string) $value;
 
-			} elseif ($type === Type::INTEGER) {
+			} elseif ($type === Type::Integer) {
 				$row[$key] = is_float($tmp = $value * 1)
 					? (is_string($value) ? $value : (int) $value)
 					: $tmp;
 
-			} elseif ($type === Type::FLOAT) {
-				$value = ltrim((string) $value, '0');
+			} elseif ($type === Type::Float) {
+				if (!is_string($value)) {
+					$row[$key] = (float) $value;
+					continue;
+				}
+
+				$negative = ($value[0] ?? null) === '-';
+				$value = ltrim($value, '0-');
 				$p = strpos($value, '.');
 				$e = strpos($value, 'e');
 				if ($p !== false && $e === false) {
@@ -479,27 +485,31 @@ class Result implements IDataSource
 					$value = '0' . $value;
 				}
 
+				if ($negative) {
+					$value = '-' . $value;
+				}
+
 				$row[$key] = $value === str_replace(',', '.', (string) ($float = (float) $value))
 					? $float
 					: $value;
 
-			} elseif ($type === Type::BOOL) {
+			} elseif ($type === Type::Bool) {
 				$row[$key] = ((bool) $value) && $value !== 'f' && $value !== 'F';
 
-			} elseif ($type === Type::DATETIME || $type === Type::DATE || $type === Type::TIME) {
+			} elseif ($type === Type::DateTime || $type === Type::Date || $type === Type::Time) {
 				if ($value && !str_starts_with((string) $value, '0000-00')) { // '', null, false, '0000-00-00', ...
 					$value = new DateTime($value);
 					$row[$key] = $format ? $value->format($format) : $value;
 				} else {
 					$row[$key] = null;
 				}
-			} elseif ($type === Type::TIME_INTERVAL) {
+			} elseif ($type === Type::TimeInterval) {
 				preg_match('#^(-?)(\d+)\D(\d+)\D(\d+)\z#', $value, $m);
 				$value = new \DateInterval("PT$m[2]H$m[3]M$m[4]S");
 				$value->invert = (int) (bool) $m[1];
 				$row[$key] = $format ? $value->format($format) : $value;
 
-			} elseif ($type === Type::BINARY) {
+			} elseif ($type === Type::Binary) {
 				$row[$key] = is_string($value)
 					? $this->getResultDriver()->unescapeBinary($value)
 					: $value;

src/Dibi/Translator.php

@@ -219,7 +219,7 @@ final class Translator
 
 				case 'a': // key=val, key=val, ...
 					foreach ($value as $k => $v) {
-						$pair = explode('%', $k, 2); // split into identifier & modifier
+						$pair = explode('%', (string) $k, 2); // split into identifier & modifier
 						$vx[] = $this->identifiers->{$pair[0]} . '='
 							. $this->formatValue($v, $pair[1] ?? (is_array($v) ? 'ex!' : null));
 					}

src/Dibi/Type.php

@@ -16,16 +16,43 @@ namespace Dibi;
 class Type
 {
 	public const
-		TEXT = 's', // as 'string'
-		BINARY = 'bin',
+		Text = 's', // as 'string'
+		Binary = 'bin',
 		JSON = 'json',
-		BOOL = 'b',
-		INTEGER = 'i',
-		FLOAT = 'f',
-		DATE = 'd',
-		DATETIME = 'dt',
-		TIME = 't',
-		TIME_INTERVAL = 'ti';
+		Bool = 'b',
+		Integer = 'i',
+		Float = 'f',
+		Date = 'd',
+		DateTime = 'dt',
+		Time = 't',
+		TimeInterval = 'ti';
+
+	/** @deprecated use Type::Text */
+	public const TEXT = self::Text;
+
+	/** @deprecated use Type::Binary */
+	public const BINARY = self::Binary;
+
+	/** @deprecated use Type::Bool */
+	public const BOOL = self::Bool;
+
+	/** @deprecated use Type::Integer */
+	public const INTEGER = self::Integer;
+
+	/** @deprecated use Type::Float */
+	public const FLOAT = self::Float;
+
+	/** @deprecated use Type::Date */
+	public const DATE = self::Date;
+
+	/** @deprecated use Type::DateTime */
+	public const DATETIME = self::DateTime;
+
+	/** @deprecated use Type::Time */
+	public const TIME = self::Time;
+
+	/** @deprecated use Type::TimeInterval */
+	public const TIME_INTERVAL = self::TimeInterval;
 
 
 	final public function __construct()

src/Dibi/dibi.php

@@ -37,12 +37,16 @@ declare(strict_types=1);
  */
 class dibi
 {
-	public const
-		AFFECTED_ROWS = 'a',
-		IDENTIFIER = 'n';
+	public const Version = '5.0.2';
 
-	/** version */
-	public const VERSION = '5.0.1';
+	/** @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 */
 	public const

tests/dibi/Fluent.select.phpt

@@ -74,7 +74,7 @@ Assert::same(
 	(string) $fluent,
 );
 
-$fluent->orderBy(Dibi\Fluent::REMOVE);
+$fluent->orderBy(Dibi\Fluent::Remove);
 
 Assert::same(
 	reformat('SELECT * , [a] , [b] AS [bAlias] , [c], [d], [e] , [d] FROM [anotherTable] AS [anotherAlias] INNER JOIN [table3] ON table.col = table3.col WHERE col > 10 OR col < 5 AND active = 1 AND [col] IN (1, 2, 3)'),

tests/dibi/Result.normalize.phpt

@@ -27,8 +27,8 @@ class MockResult extends Dibi\Result
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::TEXT);
-	$result->setFormat(Type::TEXT, 'native');
+	$result->setType('col', Type::Text);
+	$result->setFormat(Type::Text, 'native');
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => true], $result->test(['col' => true]));
@@ -38,7 +38,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::BOOL);
+	$result->setType('col', Type::Bool);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => true], $result->test(['col' => true]));
@@ -60,7 +60,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::TEXT);
+	$result->setType('col', Type::Text);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => '1'], $result->test(['col' => true]));
@@ -76,7 +76,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::FLOAT);
+	$result->setType('col', Type::Float);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => 1.0], $result->test(['col' => true]));
@@ -117,6 +117,37 @@ test('', function () {
 	Assert::same(['col' => '1.1e+10'], $result->test(['col' => '001.1e+10']));
 	Assert::notSame(['col' => '1.1e+1'], $result->test(['col' => '1.1e+10']));
 
+	// negative
+	Assert::same(['col' => -0.0], $result->test(['col' => '-']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-.0']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-.1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0.0']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-0.1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0.000']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-0.100']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1.0']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-1.1']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1.000']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-1.100']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-001.000']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-001.100']));
+	Assert::same(['col' => -10.0], $result->test(['col' => '-10']));
+	Assert::same(['col' => -11.0], $result->test(['col' => '-11']));
+	Assert::same(['col' => -10.0], $result->test(['col' => '-0010']));
+	Assert::same(['col' => -11.0], $result->test(['col' => '-0011']));
+	Assert::same(['col' => '-0.00000000000000000001'], $result->test(['col' => '-0.00000000000000000001']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-012345678901234567890']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890.000']));
+	Assert::same(['col' => '-12345678901234567890.1'], $result->test(['col' => '-012345678901234567890.100']));
+
+	Assert::same(['col' => '-1.1e+10'], $result->test(['col' => '-1.1e+10']));
+	Assert::same(['col' => '-1.1e-10'], $result->test(['col' => '-1.1e-10']));
+	Assert::same(['col' => '-1.1e+10'], $result->test(['col' => '-001.1e+10']));
+	Assert::notSame(['col' => '-1.1e+1'], $result->test(['col' => '-1.1e+10']));
+
 	setlocale(LC_ALL, 'de_DE@euro', 'de_DE', 'deu_deu');
 	Assert::same(['col' => 0.0], $result->test(['col' => '']));
 	Assert::same(['col' => 0.0], $result->test(['col' => '0']));
@@ -147,13 +178,45 @@ test('', function () {
 	Assert::same(['col' => 0.0], $result->test(['col' => 0.0]));
 	Assert::same(['col' => 1.0], $result->test(['col' => 1]));
 	Assert::same(['col' => 1.0], $result->test(['col' => 1.0]));
+
+	// Same but negative
+	Assert::same(['col' => -0.0], $result->test(['col' => '-']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-.0']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-.1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0.0']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-0.1']));
+	Assert::same(['col' => -0.0], $result->test(['col' => '-0.000']));
+	Assert::same(['col' => -0.1], $result->test(['col' => '-0.100']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1.0']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-1.1']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-1.000']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-1.100']));
+	Assert::same(['col' => -1.0], $result->test(['col' => '-001.000']));
+	Assert::same(['col' => -1.1], $result->test(['col' => '-001.100']));
+	Assert::same(['col' => -10.0], $result->test(['col' => '-10']));
+	Assert::same(['col' => -11.0], $result->test(['col' => '-11']));
+	Assert::same(['col' => -10.0], $result->test(['col' => '-0010']));
+	Assert::same(['col' => -11.0], $result->test(['col' => '-0011']));
+	Assert::same(['col' => '-0.00000000000000000001'], $result->test(['col' => '-0.00000000000000000001']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-012345678901234567890']));
+	Assert::same(['col' => '-12345678901234567890'], $result->test(['col' => '-12345678901234567890.000']));
+	Assert::same(['col' => '-12345678901234567890.1'], $result->test(['col' => '-012345678901234567890.100']));
+
+	Assert::same(['col' => -0.0], $result->test(['col' => -0]));
+	Assert::same(['col' => -0.0], $result->test(['col' => -0.0]));
+	Assert::same(['col' => -1.0], $result->test(['col' => -1]));
+	Assert::same(['col' => -1.0], $result->test(['col' => -1.0]));
+
 	setlocale(LC_NUMERIC, 'C');
 });
 
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::INTEGER);
+	$result->setType('col', Type::Integer);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::same(['col' => 1], $result->test(['col' => true]));
@@ -187,7 +250,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::DATETIME);
+	$result->setType('col', Type::DateTime);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(
@@ -206,8 +269,8 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::DATETIME);
-	$result->setFormat(Type::DATETIME, 'Y-m-d H:i:s');
+	$result->setType('col', Type::DateTime);
+	$result->setFormat(Type::DateTime, 'Y-m-d H:i:s');
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(
@@ -226,7 +289,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::DATE);
+	$result->setType('col', Type::Date);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(
@@ -243,7 +306,7 @@ test('', function () {
 
 test('', function () {
 	$result = new MockResult;
-	$result->setType('col', Type::TIME);
+	$result->setType('col', Type::Time);
 
 	Assert::same(['col' => null], $result->test(['col' => null]));
 	Assert::exception(

tests/dibi/Result.types.phpt

@@ -12,7 +12,7 @@ $conn->loadFile(__DIR__ . "/data/$config[system].sql");
 $res = $conn->query('SELECT * FROM [customers]');
 
 // auto-converts this column to integer
-$res->setType('customer_id', Dibi\Type::DATETIME);
+$res->setType('customer_id', Dibi\Type::DateTime);
 
 Assert::equal(new Dibi\Row([
 	'customer_id' => new Dibi\DateTime('1970-01-01 01:00:01'),

tests/dibi/Translator.enums.phpt

@@ -33,7 +33,7 @@ enum PureEnum
 
 Assert::equal('1', $translator->formatValue(EnumInt::One, null));
 
-Assert::equal(match ($config['driver']) {
+Assert::equal(match ($config['system']) {
 	'sqlsrv' => "N'one'",
 	default => "'one'",
 }, $translator->formatValue(EnumString::One, null));