SqlsrvDriver: workaround for "Driver's SQLSetConnectAttr failed on ODBC <=13" bug

mysqli::real_connect() expects parameter 3 to be string, yields an error on NULL.

.travis.yml

@@ -3,6 +3,7 @@ php:
     - 7.1
     - 7.2
     - 7.3
+    - 7.4
 
 services:
     - mysql

composer.json

@@ -25,7 +25,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "4.1-dev"
+			"dev-master": "4.0-dev"
 		}
 	}
 }

readme.md

@@ -26,7 +26,7 @@ Install Dibi via Composer:
 composer require dibi/dibi
 ```
 
-The Dibi 4.0 requires PHP version 7.1 and supports PHP up to 7.2. Older Dibi 3.x requires PHP 5.4 and supports PHP up to 7.2.
+The Dibi 4.0 requires PHP version 7.1 and supports PHP up to 7.4.
 
 
 Usage

src/Dibi/Connection.php

@@ -43,20 +43,32 @@ class Connection implements IConnection
 	 *   - lazy (bool) => if true, connection will be established only when required
 	 *   - result (array) => result set options
 	 *       - formatDateTime => date-time format (if empty, DateTime objects will be returned)
-	 *       - formatJson => json format (
-	 *           "string" for leaving value as is,
-	 *           "object" for decoding json as \stdClass,
-	 *           "array" for decoding json as an array - default
-	 *       )
 	 *   - profiler (array)
 	 *       - run (bool) => enable profiler?
 	 *       - file => file to log
 	 *   - substitutes (array) => map of driver specific substitutes (under development)
 	 *   - onConnect (array) => list of SQL queries to execute (by Connection::query()) after connection is established
+	 * @param  array   $config  connection parameters
 	 * @throws Exception
 	 */
-	public function __construct(array $config, string $name = null)
+	public function __construct($config, string $name = null)
 	{
+		if (is_string($config)) {
+			trigger_error(__METHOD__ . '() Configuration should be array.', E_USER_DEPRECATED);
+			parse_str($config, $config);
+
+		} elseif ($config instanceof Traversable) {
+			trigger_error(__METHOD__ . '() Configuration should be array.', E_USER_DEPRECATED);
+			$tmp = [];
+			foreach ($config as $key => $val) {
+				$tmp[$key] = $val instanceof Traversable ? iterator_to_array($val) : $val;
+			}
+			$config = $tmp;
+
+		} elseif (!is_array($config)) {
+			throw new \InvalidArgumentException('Configuration must be array.');
+		}
+
 		Helpers::alias($config, 'username', 'user');
 		Helpers::alias($config, 'password', 'pass');
 		Helpers::alias($config, 'host', 'hostname');
@@ -64,7 +76,6 @@ class Connection implements IConnection
 		Helpers::alias($config, 'result|formatDateTime', 'resultDateTime');
 		$config['driver'] = $config['driver'] ?? 'mysqli';
 		$config['name'] = $name;
-		$config['result']['formatJson'] = $config['result']['formatJson'] ?? 'array';
 		$this->config = $config;
 
 		// profiler
@@ -108,6 +119,7 @@ class Connection implements IConnection
 	{
 		if ($this->config['driver'] instanceof Driver) {
 			$this->driver = $this->config['driver'];
+			$this->translator = new Translator($this);
 			return;
 
 		} elseif (is_subclass_of($this->config['driver'], Driver::class)) {
@@ -124,6 +136,8 @@ class Connection implements IConnection
 		$event = $this->onEvent ? new Event($this, Event::CONNECT) : null;
 		try {
 			$this->driver = new $class($this->config);
+			$this->translator = new Translator($this);
+
 			if ($event) {
 				$this->onEvent($event->done());
 			}
@@ -149,7 +163,7 @@ class Connection implements IConnection
 	{
 		if ($this->driver) {
 			$this->driver->disconnect();
-			$this->driver = null;
+			$this->driver = $this->translator = null;
 		}
 	}
 
@@ -250,11 +264,7 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
-		if (!$this->translator) {
-			$this->translator = new Translator($this);
-		}
-		$translator = clone $this->translator;
-		return $translator->translate($args);
+		return (clone $this->translator)->translate($args);
 	}
 
 
@@ -305,6 +315,16 @@ class Connection implements IConnection
 	}
 
 
+	/**
+	 * @deprecated
+	 */
+	public function affectedRows(): int
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use getAffectedRows()', E_USER_DEPRECATED);
+		return $this->getAffectedRows();
+	}
+
+
 	/**
 	 * Retrieves the ID generated for an AUTO_INCREMENT column by the previous INSERT query.
 	 * @throws Exception
@@ -315,13 +335,23 @@ class Connection implements IConnection
 			$this->connect();
 		}
 		$id = $this->driver->getInsertId($sequence);
-		if ($id === null) {
+		if ($id < 1) {
 			throw new Exception('Cannot retrieve last generated ID.');
 		}
 		return $id;
 	}
 
 
+	/**
+	 * @deprecated
+	 */
+	public function insertId(string $sequence = null): int
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use getInsertId()', E_USER_DEPRECATED);
+		return $this->getInsertId($sequence);
+	}
+
+
 	/**
 	 * Begins a transaction (if supported).
 	 */
@@ -401,8 +431,7 @@ class Connection implements IConnection
 	{
 		$res = new Result($resultDriver);
 		return $res->setFormat(Type::DATE, $this->config['result']['formatDate'])
-			->setFormat(Type::DATETIME, $this->config['result']['formatDateTime'])
-			->setFormat(Type::JSON, $this->config['result']['formatJson']);
+			->setFormat(Type::DATETIME, $this->config['result']['formatDateTime']);
 	}
 
 

src/Dibi/DateTime.php

@@ -32,8 +32,77 @@ class DateTime extends \DateTimeImmutable
 	}
 
 
+	/** @deprecated  use modify() */
+	public function modifyClone(string $modify = ''): self
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use modify()', E_USER_DEPRECATED);
+		$dolly = clone $this;
+		return $modify ? $dolly->modify($modify) : $dolly;
+	}
+
+
 	public function __toString(): string
 	{
 		return $this->format('Y-m-d H:i:s.u');
 	}
+
+
+	/********************* immutable usage detector ****************d*g**/
+
+
+	public function __destruct()
+	{
+		$trace = debug_backtrace(DEBUG_BACKTRACE_IGNORE_ARGS, 2);
+		if (isset($trace[0]['file'], $trace[1]['function']) && $trace[0]['file'] === __FILE__ && $trace[1]['function'] !== '__construct') {
+			trigger_error(__CLASS__ . ' is immutable now, check how it is used in ' . $trace[1]['file'] . ':' . $trace[1]['line'], E_USER_WARNING);
+		}
+	}
+
+
+	public function add($interval)
+	{
+		return parent::add($interval);
+	}
+
+
+	public function modify($modify)
+	{
+		return parent::modify($modify);
+	}
+
+
+	public function setDate($year, $month, $day)
+	{
+		return parent::setDate($year, $month, $day);
+	}
+
+
+	public function setISODate($year, $week, $day = 1)
+	{
+		return parent::setISODate($year, $week, $day);
+	}
+
+
+	public function setTime($hour, $minute, $second = 0, $micro = 0)
+	{
+		return parent::setTime($hour, $minute, $second, $micro);
+	}
+
+
+	public function setTimestamp($unixtimestamp)
+	{
+		return parent::setTimestamp($unixtimestamp);
+	}
+
+
+	public function setTimezone($timezone)
+	{
+		return parent::setTimezone($timezone);
+	}
+
+
+	public function sub($interval)
+	{
+		return parent::sub($interval);
+	}
 }

src/Dibi/Drivers/FirebirdDriver.php

@@ -247,24 +247,30 @@ class FirebirdDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format("'Y-m-d'");
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		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.
 	 */

src/Dibi/Drivers/MySqliDriver.php

@@ -93,7 +93,7 @@ class MySqliDriver implements Dibi\Driver
 			@$this->connection->real_connect( // intentionally @
 				(empty($config['persistent']) ? '' : 'p:') . $config['host'],
 				$config['username'],
-				$config['password'],
+				$config['password'] ?? '',
 				$config['database'] ?? '',
 				$config['port'] ?? 0,
 				$config['socket'],
@@ -199,7 +199,7 @@ class MySqliDriver implements Dibi\Driver
 	 */
 	public function getInsertId(?string $sequence): ?int
 	{
-		return $this->connection->insert_id ?: null;
+		return $this->connection->insert_id;
 	}
 
 
@@ -290,24 +290,27 @@ class MySqliDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format("'Y-m-d'");
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($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.');
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
 		}
-		return $value->format('%r%H:%I:%S.%f');
+		return $value->format("'Y-m-d H:i:s.u'");
 	}
 
 
@@ -331,7 +334,7 @@ class MySqliDriver implements Dibi\Driver
 
 		} elseif ($limit !== null || $offset) {
 			// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-			$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
+			$sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : $limit)
 				. ($offset ? ' OFFSET ' . $offset : '');
 		}
 	}

src/Dibi/Drivers/OdbcDriver.php

@@ -226,24 +226,30 @@ class OdbcDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format('#m/d/Y#');
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		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.
 	 */

src/Dibi/Drivers/OracleDriver.php

@@ -52,6 +52,10 @@ class OracleDriver implements Dibi\Driver
 		}
 
 		$foo = &$config['charset'];
+
+		if (isset($config['formatDate']) || isset($config['formatDateTime'])) {
+			trigger_error('OracleDriver: options formatDate and formatDateTime are deprecated.', E_USER_DEPRECATED);
+		}
 		$this->nativeDate = $config['nativeDate'] ?? true;
 
 		if (isset($config['resource'])) {
@@ -241,28 +245,34 @@ class OracleDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $this->nativeDate
 			? "to_date('" . $value->format('Y-m-d') . "', 'YYYY-mm-dd')"
 			: $value->format('U');
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		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.
 	 */

src/Dibi/Drivers/PdoDriver.php

@@ -289,14 +289,26 @@ class PdoDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format($this->driverName === 'odbc' ? '#m/d/Y#' : "'Y-m-d'");
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		switch ($this->driverName) {
 			case 'odbc':
 				return $value->format('#m/d/Y H:i:s.u#');
@@ -310,12 +322,6 @@ class PdoDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 */
@@ -367,7 +373,7 @@ class PdoDriver implements Dibi\Driver
 			case 'mysql':
 				if ($limit !== null || $offset) {
 					// see http://dev.mysql.com/doc/refman/5.0/en/select.html
-					$sql .= ' LIMIT ' . ($limit ?? '18446744073709551615')
+					$sql .= ' LIMIT ' . ($limit === null ? '18446744073709551615' : $limit)
 						. ($offset ? ' OFFSET ' . $offset : '');
 				}
 				break;
@@ -383,7 +389,7 @@ class PdoDriver implements Dibi\Driver
 
 			case 'sqlite':
 				if ($limit !== null || $offset) {
-					$sql .= ' LIMIT ' . ($limit ?? '-1')
+					$sql .= ' LIMIT ' . ($limit === null ? '-1' : $limit)
 						. ($offset ? ' OFFSET ' . $offset : '');
 				}
 				break;

src/Dibi/Drivers/PostgreDriver.php

@@ -292,24 +292,30 @@ class PostgreDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format("'Y-m-d'");
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		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.
 	 */

src/Dibi/Drivers/SqliteDriver.php

@@ -139,7 +139,7 @@ class SqliteDriver implements Dibi\Driver
 	 */
 	public function getInsertId(?string $sequence): ?int
 	{
-		return $this->connection->lastInsertRowID() ?: null;
+		return $this->connection->lastInsertRowID();
 	}
 
 
@@ -230,24 +230,30 @@ class SqliteDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format($this->fmtDate);
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format($this->fmtDateTime);
 	}
 
 
-	public function escapeDateInterval(\DateInterval $value): string
-	{
-		throw new Dibi\NotImplementedException;
-	}
-
-
 	/**
 	 * Encodes string for use in a LIKE statement.
 	 */
@@ -267,7 +273,7 @@ class SqliteDriver implements Dibi\Driver
 			throw new Dibi\NotSupportedException('Negative offset or limit.');
 
 		} elseif ($limit !== null || $offset) {
-			$sql .= ' LIMIT ' . ($limit ?? '-1')
+			$sql .= ' LIMIT ' . ($limit === null ? '-1' : $limit)
 				. ($offset ? ' OFFSET ' . $offset : '');
 		}
 	}

src/Dibi/Drivers/SqliteResult.php

@@ -96,7 +96,7 @@ class SqliteResult implements Dibi\ResultDriver
 				'name' => $this->resultSet->columnName($i),
 				'table' => null,
 				'fullname' => $this->resultSet->columnName($i),
-				'nativetype' => $types[$this->resultSet->columnType($i)],
+				'nativetype' => $types[$this->resultSet->columnType($i)] ?? null, // buggy in PHP 7.4.4 & 7.3.16, bug 79414
 			];
 		}
 		return $columns;

src/Dibi/Drivers/SqlsrvDriver.php

@@ -65,11 +65,13 @@ class SqlsrvDriver implements Dibi\Driver
 			$options['UID'] = (string) $options['UID'];
 			$options['Database'] = (string) $options['Database'];
 
+			sqlsrv_configure('WarningsReturnAsErrors', 0);
 			$this->connection = sqlsrv_connect($config['host'], $options);
+			sqlsrv_configure('WarningsReturnAsErrors', 1);
 		}
 
 		if (!is_resource($this->connection)) {
-			$info = sqlsrv_errors();
+			$info = sqlsrv_errors(SQLSRV_ERR_ERRORS);
 			throw new Dibi\DriverException($info[0]['message'], $info[0]['code']);
 		}
 		$this->version = sqlsrv_server_info($this->connection)['SQLServerVersion'];
@@ -196,7 +198,7 @@ class SqlsrvDriver implements Dibi\Driver
 	 */
 	public function escapeText(string $value): string
 	{
-		return "N'" . str_replace("'", "''", $value) . "'";
+		return "'" . str_replace("'", "''", $value) . "'";
 	}
 
 
@@ -219,24 +221,30 @@ class SqlsrvDriver implements Dibi\Driver
 	}
 
 
-	public function escapeDate(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDate($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		return $value->format("'Y-m-d'");
 	}
 
 
-	public function escapeDateTime(\DateTimeInterface $value): string
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	public function escapeDateTime($value): string
 	{
+		if (!$value instanceof \DateTimeInterface) {
+			$value = new Dibi\DateTime($value);
+		}
 		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.
 	 */

src/Dibi/Drivers/SqlsrvReflector.php

@@ -100,7 +100,7 @@ class SqlsrvReflector implements Dibi\Reflector
 	 */
 	public function getIndexes(string $table): array
 	{
-		$keyUsagesRes = $this->driver->query(sprintf('EXEC [sys].[sp_helpindex] @objname = %s', $this->driver->escapeText($table)));
+		$keyUsagesRes = $this->driver->query(sprintf('EXEC [sys].[sp_helpindex] @objname = N%s', $this->driver->escapeText($table)));
 		$keyUsages = [];
 		while ($row = $keyUsagesRes->fetch(true)) {
 			$keyUsages[$row['index_name']] = explode(',', $row['index_keys']);

src/Dibi/Fluent.php

@@ -423,7 +423,7 @@ class Fluent implements IDataSource
 		if ($clause === null) {
 			$data = $this->clauses;
 			if ($this->command === 'SELECT' && ($data['LIMIT'] || $data['OFFSET'])) {
-				$args = array_merge(['%lmt %ofs', $data['LIMIT'][0], $data['OFFSET'][0]], $args);
+				$args = array_merge(['%lmt %ofs', $data['LIMIT'][0] ?? null, $data['OFFSET'][0] ?? null], $args);
 				unset($data['LIMIT'], $data['OFFSET']);
 			}
 

src/Dibi/Result.php

@@ -282,7 +282,7 @@ class Result implements IDataSource
 					}
 
 				} elseif ($as !== '|') { // associative-array node
-					$x = &$x[$row->$as];
+					$x = &$x[(string) $row->$as];
 				}
 			}
 
@@ -350,7 +350,7 @@ class Result implements IDataSource
 					}
 
 				} else { // associative-array node
-					$x = &$x[$row->$as];
+					$x = &$x[(string) $row->$as];
 				}
 			}
 
@@ -452,6 +452,7 @@ class Result implements IDataSource
 				continue;
 			}
 			$value = $row[$key];
+
 			if ($type === Type::TEXT) {
 				$row[$key] = (string) $value;
 
@@ -496,11 +497,10 @@ class Result implements IDataSource
 				$row[$key] = is_string($value) ? $this->getResultDriver()->unescapeBinary($value) : $value;
 
 			} elseif ($type === Type::JSON) {
-				if ($this->formats[$type] === 'string') {
-					$row[$key] = $value;
-				} else {
-					$row[$key] = json_decode($value, $this->formats[$type] === 'array');
-				}
+				$row[$key] = json_decode($value, true);
+
+			} else {
+				$row[$key] = $value;
 			}
 		}
 	}

src/Dibi/Strict.php

@@ -29,6 +29,12 @@ trait Strict
 	 */
 	public function __call(string $name, array $args)
 	{
+		$class = get_class($this);
+		if ($cb = self::extensionMethod($class . '::' . $name)) { // back compatiblity
+			trigger_error("Extension methods such as $class::$name() are deprecated", E_USER_DEPRECATED);
+			array_unshift($args, $this);
+			return $cb(...$args);
+		}
 		$class = method_exists($this, $name) ? 'parent' : get_class($this);
 		$items = (new ReflectionClass($this))->getMethods(ReflectionMethod::IS_PUBLIC);
 		$hint = ($t = Helpers::getSuggestion($items, $name)) ? ", did you mean $t()?" : '.';
@@ -96,4 +102,39 @@ trait Strict
 		$class = get_class($this);
 		throw new \LogicException("Attempt to unset undeclared property $class::$$name.");
 	}
+
+
+	/**
+	 * @return mixed
+	 * @deprecated
+	 */
+	public static function extensionMethod(string $name, callable $callback = null)
+	{
+		if (strpos($name, '::') === false) {
+			$class = get_called_class();
+		} else {
+			[$class, $name] = explode('::', $name);
+			$class = (new ReflectionClass($class))->getName();
+		}
+
+		$list = &self::$extMethods[strtolower($name)];
+		if ($callback === null) { // getter
+			$cache = &$list[''][$class];
+			if (isset($cache)) {
+				return $cache;
+			}
+
+			foreach ([$class] + class_parents($class) + class_implements($class) as $cl) {
+				if (isset($list[$cl])) {
+					return $cache = $list[$cl];
+				}
+			}
+			return $cache = false;
+
+		} else { // setter
+			trigger_error("Extension methods such as $class::$name() are deprecated", E_USER_DEPRECATED);
+			$list[$class] = $callback;
+			$list[''] = null;
+		}
+	}
 }

src/Dibi/Translator.php

@@ -151,7 +151,7 @@ final class Translator
 			$sql[] = '*/';
 		}
 
-		$sql = trim(implode(' ', $sql), ' ');
+		$sql = implode(' ', $sql);
 
 		if ($this->errors) {
 			throw new Exception('SQL translate error: ' . trim(reset($this->errors), '*'), 0, $sql);
@@ -381,11 +381,10 @@ final class Translator
 				case 'dt': // datetime
 					if ($value === null) {
 						return 'NULL';
-					} elseif (!$value instanceof \DateTimeInterface) {
-						$value = new DateTime($value);
+					} else {
+						return $modifier === 'd' ? $this->driver->escapeDate($value) : $this->driver->escapeDateTime($value);
 					}
-					return $modifier === 'd' ? $this->driver->escapeDate($value) : $this->driver->escapeDateTime($value);
-
+					// break omitted
 				case 'by':
 				case 'n':  // composed identifier name
 					return $this->identifiers->$value;
@@ -456,9 +455,6 @@ final class Translator
 		} elseif ($value instanceof \DateTimeInterface) {
 			return $this->driver->escapeDateTime($value);
 
-		} elseif ($value instanceof \DateInterval) {
-			return $this->driver->escapeDateInterval($value);
-
 		} elseif ($value instanceof Literal) {
 			return (string) $value;
 

src/Dibi/dibi.php

@@ -44,7 +44,7 @@ class dibi
 
 	/** version */
 	public const
-		VERSION = '4.1.0';
+		VERSION = '4.0.3';
 
 	/** sorting order */
 	public const
@@ -145,6 +145,26 @@ class dibi
 	}
 
 
+	/**
+	 * @deprecated
+	 */
+	public static function affectedRows(): int
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use getAffectedRows()', E_USER_DEPRECATED);
+		return self::getConnection()->getAffectedRows();
+	}
+
+
+	/**
+	 * @deprecated
+	 */
+	public static function insertId(string $sequence = null): int
+	{
+		trigger_error(__METHOD__ . '() is deprecated, use getInsertId()', E_USER_DEPRECATED);
+		return self::getConnection()->getInsertId($sequence);
+	}
+
+
 	/********************* misc tools ****************d*g**/
 
 

src/Dibi/interfaces.php

@@ -87,11 +87,15 @@ interface Driver
 
 	function escapeBool(bool $value): string;
 
-	function escapeDate(\DateTimeInterface $value): string;
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	function escapeDate($value): string;
 
-	function escapeDateTime(\DateTimeInterface $value): string;
-
-	function escapeDateInterval(\DateInterval $value): string;
+	/**
+	 * @param  \DateTimeInterface|string|int  $value
+	 */
+	function escapeDateTime($value): string;
 
 	/**
 	 * Encodes string for use in a LIKE statement.

tests/dibi/Connection.connect.phpt

@@ -52,6 +52,17 @@ test(function () use ($config) {
 });
 
 
+test(function () use ($config) {
+	$conn = new Connection($config);
+	Assert::equal('hello', $conn->query('SELECT %s', 'hello')->fetchSingle());
+
+	$conn->disconnect();
+
+	$conn->connect();
+	Assert::equal('hello', $conn->query('SELECT %s', 'hello')->fetchSingle());
+});
+
+
 test(function () use ($config) {
 	Assert::exception(function () use ($config) {
 		new Connection($config + ['onConnect' => '']);

tests/dibi/DataSource.phpt

@@ -77,7 +77,7 @@ SELECT [product_id]
 FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
-) t"), dibi::$sql);
+ ) t"), dibi::$sql);
 Assert::same(1, $ds->toDataSource()->count());
 
 
@@ -93,7 +93,7 @@ SELECT [product_id]
 FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
-"),
+ "),
 	dibi::$sql
 );
 
@@ -106,7 +106,7 @@ SELECT [product_id]
 FROM (SELECT * FROM products) t
  WHERE (title like '%a%') AND (product_id = 1) AND (product_id = 1)
  ORDER BY [product_id] ASC
-) t"),
+ ) t"),
 	(string) $fluent
 );
 

tests/dibi/Fluent.fetch.limit.mssql.phpt

@@ -56,28 +56,28 @@ $fluent = $conn->select('*')
 	->orderBy('customer_id');
 
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
 
 $fluent->fetch();
 Assert::same(
-	'SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t',
+	'SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t',
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchAll(0, 3);
 Assert::same(
-	reformat('SELECT TOP (3) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (3) * FROM (    SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
@@ -85,16 +85,16 @@ Assert::same(
 $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT TOP (0) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (0) * FROM (  SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	(string) $fluent
 );
 
@@ -103,12 +103,12 @@ $fluent->removeClause('limit');
 $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT TOP (1) * FROM (SELECT * FROM [customers] ORDER BY [customer_id]) t'),
+	reformat('SELECT TOP (1) * FROM ( SELECT * FROM [customers] ORDER BY [customer_id]) t'),
 	dibi::$sql
 );
 Assert::same(

tests/dibi/Fluent.fetch.limit.phpt

@@ -22,28 +22,28 @@ $fluent = $conn->select('*')
 	->orderBy('customer_id');
 
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	(string) $fluent
 );
 
 
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	dibi::$sql
 );
 $fluent->fetchAll(2, 3);
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 3 OFFSET 2'),
+	reformat('    SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 3 OFFSET 2'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	(string) $fluent
 );
 
@@ -51,16 +51,16 @@ Assert::same(
 $fluent->limit(0);
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 0 OFFSET 3'),
 	(string) $fluent
 );
 
@@ -68,16 +68,16 @@ Assert::same(
 $fluent->removeClause('limit');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('   SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
+	reformat('   SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1 OFFSET 3'),
 	dibi::$sql
 );
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 18446744073709551615 OFFSET 3'),
+	reformat('  SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 18446744073709551615 OFFSET 3'),
 	(string) $fluent
 );
 
@@ -85,12 +85,12 @@ Assert::same(
 $fluent->removeClause('offset');
 $fluent->fetch();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
+	reformat(' SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
 	dibi::$sql
 );
 $fluent->fetchSingle();
 Assert::same(
-	reformat('SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
+	reformat(' SELECT * FROM [customers] ORDER BY [customer_id] LIMIT 1'),
 	dibi::$sql
 );
 Assert::same(

tests/dibi/Fluent.select.phpt

@@ -95,9 +95,9 @@ $fluent = $conn->select('*')
 
 Assert::same(
 	reformat([
-		'odbc' => 'SELECT TOP 1 * FROM (SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123) t',
-		'sqlsrv' => 'SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
-		'SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 LIMIT 1',
+		'odbc' => 'SELECT TOP 1 * FROM (  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123) t',
+		'sqlsrv' => '  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 OFFSET 0 ROWS FETCH NEXT 1 ROWS ONLY',
+		'  SELECT * , (SELECT count(*) FROM [precteni] AS [P] WHERE P.id_clanku = C.id_clanku) FROM [clanky] AS [C] WHERE id_clanku=123 LIMIT 1',
 	]),
 	(string) $fluent
 );
@@ -134,10 +134,7 @@ $fluent = $conn->select('*')
 	->where(['x' => 'a', 'b', 'c']);
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = N'a') AND (b) AND (c)",
-		"SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = 'a') AND (b) AND (c)",
-	]),
+	reformat('SELECT * FROM [me] AS [t] WHERE col > 10 AND ([x] = \'a\') AND (b) AND (c)'),
 	(string) $fluent
 );
 

tests/dibi/Translator.DateInterval.phpt

@@ -1,25 +0,0 @@
-<?php
-
-declare(strict_types=1);
-
-use Tester\Assert;
-
-require __DIR__ . '/bootstrap.php';
-
-$conn = new Dibi\Connection($config);
-$translator = new Dibi\Translator($conn);
-
-switch ($config['system']) {
-	case 'mysql':
-		Assert::equal('10:20:30.0', $translator->formatValue(new DateInterval('PT10H20M30S'), null));
-		Assert::equal('-1:00:00.0', $translator->formatValue(DateInterval::createFromDateString('-1 hour'), null));
-		Assert::exception(function () use ($translator) {
-			$translator->formatValue(new DateInterval('P2Y4DT6H8M'), null);
-		}, Dibi\NotSupportedException::class, 'Only time interval is supported.');
-		break;
-
-	default:
-		Assert::exception(function () use ($translator) {
-			$translator->formatValue(new DateInterval('PT10H20M30S'), null);
-		}, Dibi\Exception::class);
-}

tests/dibi/Translator.conditions.phpt

@@ -60,22 +60,13 @@ WHERE [id] > 0
 
 // nested condition
 Assert::match(
-	reformat([
-		'sqlsrv' => "
-SELECT *
-FROM [customers]
-WHERE
-	 [name] LIKE N'xxx'
-		/* AND ...=1 */
-	/* 1 LIMIT 10 */",
-		"
+	reformat("
 SELECT *
 FROM [customers]
 WHERE
 	 [name] LIKE 'xxx'
 		/* AND ...=1 */
-	/* 1 LIMIT 10 */",
-	]),
+	/* 1 LIMIT 10 */"),
 
 	$conn->translate('
 SELECT *

tests/dibi/Translator.phpt

@@ -16,10 +16,7 @@ $conn = new Dibi\Connection($config + ['formatDateTime' => "'Y-m-d H:i:s.u'", 'f
 
 // Dibi detects INSERT or REPLACE command & booleans
 Assert::same(
-	reformat([
-		'sqlsrv' => "REPLACE INTO [products] ([title], [price]) VALUES (N'Drticka', 318)",
-		"REPLACE INTO [products] ([title], [price]) VALUES ('Drticka', 318)",
-	]),
+	reformat("REPLACE INTO [products] ([title], [price]) VALUES ('Drticka', 318)"),
 	$conn->translate('REPLACE INTO [products]', [
 		'title' => 'Drticka',
 		'price' => 318,
@@ -34,10 +31,7 @@ $array = [
 	'brand' => null,
 ];
 Assert::same(
-	reformat([
-		'sqlsrv' => "INSERT INTO [products] ([title], [price], [brand]) VALUES (N'Super Product', 12, NULL) , (N'Super Product', 12, NULL) , (N'Super Product', 12, NULL)",
-		"INSERT INTO [products] ([title], [price], [brand]) VALUES ('Super Product', 12, NULL) , ('Super Product', 12, NULL) , ('Super Product', 12, NULL)",
-	]),
+	reformat('INSERT INTO [products] ([title], [price], [brand]) VALUES (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL) , (\'Super Product\', 12, NULL)'),
 	$conn->translate('INSERT INTO [products]', $array, $array, $array)
 );
 
@@ -49,20 +43,14 @@ $array = [
 	['pole' => 'hodnota3', 'bit' => 1],
 ];
 Assert::same(
-	reformat([
-		'sqlsrv' => "INSERT INTO [products]  ([pole], [bit]) VALUES (N'hodnota1', 1) , (N'hodnota2', 1) , (N'hodnota3', 1)",
-		"INSERT INTO [products]  ([pole], [bit]) VALUES ('hodnota1', 1) , ('hodnota2', 1) , ('hodnota3', 1)",
-	]),
+	reformat('INSERT INTO [products]  ([pole], [bit]) VALUES (\'hodnota1\', 1) , (\'hodnota2\', 1) , (\'hodnota3\', 1)'),
 	$conn->translate('INSERT INTO [products] %ex', $array)
 );
 
 
 // Dibi detects UPDATE command
 Assert::same(
-	reformat([
-		'sqlsrv' => "UPDATE [colors] SET [color]=N'blue', [order]=12 WHERE [id]=123",
-		"UPDATE [colors] SET [color]='blue', [order]=12 WHERE [id]=123",
-	]),
+	reformat("UPDATE [colors] SET [color]='blue', [order]=12 WHERE [id]=123"),
 	$conn->translate('UPDATE [colors] SET', [
 		'color' => 'blue',
 		'order' => 12,
@@ -97,26 +85,17 @@ $e = Assert::exception(function () use ($conn) {
 Assert::same('SELECT **Invalid combination of type stdClass and modifier %s** , **Unknown or unexpected modifier %m**', $e->getSql());
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT * FROM [table] WHERE id=10 AND name=N'ahoj'",
-		"SELECT * FROM [table] WHERE id=10 AND name='ahoj'",
-	]),
+	reformat('SELECT * FROM [table] WHERE id=10 AND name=\'ahoj\''),
 	$conn->translate('SELECT * FROM [table] WHERE id=%i AND name=%s', 10, 'ahoj')
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "TEST ([cond] > 2) OR ([cond2] = N'3') OR (cond3 < RAND())",
-		"TEST ([cond] > 2) OR ([cond2] = '3') OR (cond3 < RAND())",
-	]),
+	reformat('TEST ([cond] > 2) OR ([cond2] = \'3\') OR (cond3 < RAND())'),
 	$conn->translate('TEST %or', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'])
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "TEST ([cond] > 2) AND ([cond2] = N'3') AND (cond3 < RAND())",
-		"TEST ([cond] > 2) AND ([cond2] = '3') AND (cond3 < RAND())",
-	]),
+	reformat('TEST ([cond] > 2) AND ([cond2] = \'3\') AND (cond3 < RAND())'),
 	$conn->translate('TEST %and', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'])
 );
 
@@ -135,10 +114,7 @@ $where['age'] = null;
 $where['email'] = 'ahoj';
 $where['id%l'] = [10, 20, 30];
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = N'ahoj') AND ([id] IN (10, 20, 30))",
-		"SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = 'ahoj') AND ([id] IN (10, 20, 30))",
-	]),
+	reformat('SELECT * FROM [table] WHERE ([age] IS NULL) AND ([email] = \'ahoj\') AND ([id] IN (10, 20, 30))'),
 	$conn->translate('SELECT * FROM [table] WHERE %and', $where)
 );
 
@@ -168,9 +144,9 @@ Assert::same(
 // with limit = 2
 Assert::same(
 	reformat([
-		'odbc' => 'SELECT TOP 2 * FROM (SELECT * FROM [products]) t',
+		'odbc' => 'SELECT TOP 2 * FROM (SELECT * FROM [products] ) t',
 		'sqlsrv' => 'SELECT * FROM [products] OFFSET 0 ROWS FETCH NEXT 2 ROWS ONLY',
-		'SELECT * FROM [products] LIMIT 2',
+		'SELECT * FROM [products]  LIMIT 2',
 	]),
 	$conn->translate('SELECT * FROM [products] %lmt', 2)
 );
@@ -184,7 +160,7 @@ if ($config['system'] === 'odbc') {
 	Assert::same(
 		reformat([
 			'sqlsrv' => 'SELECT * FROM [products] OFFSET 1 ROWS FETCH NEXT 2 ROWS ONLY',
-			'SELECT * FROM [products] LIMIT 2 OFFSET 1',
+			'SELECT * FROM [products]   LIMIT 2 OFFSET 1',
 		]),
 		$conn->translate('SELECT * FROM [products] %lmt %ofs', 2, 1)
 	);
@@ -192,10 +168,10 @@ if ($config['system'] === 'odbc') {
 	// with offset = 50
 	Assert::same(
 		reformat([
-			'mysql' => 'SELECT * FROM `products` LIMIT 18446744073709551615 OFFSET 50',
-			'postgre' => 'SELECT * FROM "products" OFFSET 50',
+			'mysql' => 'SELECT * FROM `products`  LIMIT 18446744073709551615 OFFSET 50',
+			'postgre' => 'SELECT * FROM "products"  OFFSET 50',
 			'sqlsrv' => 'SELECT * FROM [products] OFFSET 50 ROWS',
-			'SELECT * FROM [products] LIMIT -1 OFFSET 50',
+			'SELECT * FROM [products]  LIMIT -1 OFFSET 50',
 		]),
 		$conn->translate('SELECT * FROM [products] %ofs', 50)
 	);
@@ -283,13 +259,7 @@ INTO OUTFILE '/tmp/result\'.txt'
 FIELDS TERMINATED BY ',' OPTIONALLY ENCLOSED BY '\\\"'
 LINES TERMINATED BY '\\\\n'
 ",
-		'sqlsrv' => "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
-CONCAT(last_name, N', ', first_name) AS full_name
-GROUP BY [user]
-HAVING MAX(salary) > %i 123
-INTO OUTFILE N'/tmp/result''.txt'
-FIELDS TERMINATED BY N',' OPTIONALLY ENCLOSED BY N'\"'
-LINES TERMINATED BY N'\\n'", "SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
+		"SELECT DISTINCT HIGH_PRIORITY SQL_BUFFER_RESULT
 CONCAT(last_name, ', ', first_name) AS full_name
 GROUP BY [user]
 HAVING MAX(salary) > %i 123
@@ -351,27 +321,6 @@ WHERE (`test`.`a` LIKE '1995-03-01'
 	OR `false`= 0
 	OR `str_null`=NULL
 	OR `str_not_null`='hello'
-LIMIT 10",
-		'sqlsrv' => "SELECT *
-FROM [db].[table]
-WHERE ([test].[a] LIKE '1995-03-01'
-	OR [b1] IN ( 1, 2, 3 )
-	OR [b2] IN (N'1', N'2', N'3' )
-	OR [b3] IN ( )
-	OR [b4] IN ( N'one', N'two', N'three' )
-	OR [b5] IN ([col1] AS [one], [col2] AS [two], [col3] AS [thr.ee] )
-	OR [b6] IN (N'one', N'two', N'thr.ee')
-	OR [b7] IN (NULL)
-	OR [b8] IN (RAND() [col1] > [col2] )
-	OR [b9] IN (RAND(), [col1] > [col2] )
-	OR [b10] IN (  )
-	AND [c] = N'embedded '' string'
-	OR [d]=10
-	OR [e]=NULL
-	OR [true]= 1
-	OR [false]= 0
-	OR [str_null]=NULL
-	OR [str_not_null]=N'hello'
 LIMIT 10",
 		'postgre' => 'SELECT *
 FROM "db"."table"
@@ -463,10 +412,7 @@ LIMIT 10')
 
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "TEST  [cond] > 2 [cond2] = N'3' cond3 < RAND() 123",
-		"TEST  [cond] > 2 [cond2] = '3' cond3 < RAND() 123",
-	]),
+	reformat('TEST  [cond] > 2 [cond2] = \'3\' cond3 < RAND() 123'),
 	$conn->translate('TEST %ex', ['[cond] > 2', '[cond2] = "3"', 'cond3 < RAND()'], 123)
 );
 
@@ -484,19 +430,16 @@ Assert::same(
 
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE N'string')",
-		"TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE 'string')",
-	]),
+	reformat('TEST ([cond1] 3) OR ([cond2] RAND()) OR ([cond3] LIKE \'string\')'),
 	$conn->translate('TEST %or', ['cond1%ex' => 3, 'cond2%ex' => 'RAND()', 'cond3%ex' => ['LIKE %s', 'string']])
 );
 
 
 Assert::same(
 	reformat([
-		'odbc' => 'SELECT TOP 10 * FROM (SELECT * FROM [test] WHERE [id] LIKE \'%d%t\') t',
-		'sqlsrv' => 'SELECT * FROM [test] WHERE [id] LIKE N\'%d%t\' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
-		'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' LIMIT 10',
+		'odbc' => 'SELECT TOP 10 * FROM (SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' ) t',
+		'sqlsrv' => 'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\' OFFSET 0 ROWS FETCH NEXT 10 ROWS ONLY',
+		'SELECT * FROM [test] WHERE [id] LIKE \'%d%t\'  LIMIT 10',
 	]),
 	$conn->translate("SELECT * FROM [test] WHERE %n LIKE '%d%t' %lmt", 'id', 10)
 );
@@ -512,32 +455,23 @@ Assert::same(
 
 
 Assert::same(
-	reformat('SELECT FROM ...'),
+	reformat('SELECT FROM ... '),
 	$conn->translate('SELECT FROM ... %lmt', null)
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT N'%i'",
-		"SELECT '%i'",
-	]),
+	reformat('SELECT \'%i\''),
 	$conn->translate("SELECT '%i'")
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT N'%i'",
-		"SELECT '%i'",
-	]),
+	reformat('SELECT \'%i\''),
 	$conn->translate('SELECT "%i"')
 );
 
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "INSERT INTO [products] ([product_id], [title]) VALUES (1, SHA1(N'Test product')) , (1, SHA1(N'Test product'))",
-		"INSERT INTO [products] ([product_id], [title]) VALUES (1, SHA1('Test product')) , (1, SHA1('Test product'))",
-	]),
+	reformat('INSERT INTO [products] ([product_id], [title]) VALUES (1, SHA1(\'Test product\')) , (1, SHA1(\'Test product\'))'),
 	$conn->translate('INSERT INTO [products]', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
@@ -548,10 +482,7 @@ Assert::same(
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "UPDATE [products] [product_id]=1, [title]=SHA1(N'Test product')",
-		"UPDATE [products] [product_id]=1, [title]=SHA1('Test product')",
-	]),
+	reformat('UPDATE [products] [product_id]=1, [title]=SHA1(\'Test product\')'),
 	$conn->translate('UPDATE [products]', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
@@ -559,10 +490,7 @@ Assert::same(
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "UPDATE [products] [product_id]=1, [title]=SHA1(N'Test product')",
-		"UPDATE [products] [product_id]=1, [title]=SHA1('Test product')",
-	]),
+	reformat('UPDATE [products] [product_id]=1, [title]=SHA1(\'Test product\')'),
 	$conn->translate('UPDATE [products]', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
@@ -570,10 +498,7 @@ Assert::same(
 );
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "SELECT * FROM [products] WHERE [product_id]=1, [title]=SHA1(N'Test product')",
-		"SELECT * FROM [products] WHERE [product_id]=1, [title]=SHA1('Test product')",
-	]),
+	reformat('SELECT * FROM [products] WHERE [product_id]=1, [title]=SHA1(\'Test product\')'),
 	$conn->translate('SELECT * FROM [products] WHERE', [
 		'product_id' => 1,
 		'title' => new Dibi\Expression('SHA1(%s)', 'Test product'),
@@ -610,10 +535,7 @@ $array6 = [
 ];
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "INSERT INTO test ([id], [text], [num]) VALUES (1, N'ahoj', 1), (2, N'jak', -1), (3, N'se', 10), (4, SUM(5), 1)",
-		"INSERT INTO test ([id], [text], [num]) VALUES (1, 'ahoj', 1), (2, 'jak', -1), (3, 'se', 10), (4, SUM(5), 1)",
-	]),
+	reformat('INSERT INTO test ([id], [text], [num]) VALUES (1, \'ahoj\', 1), (2, \'jak\', -1), (3, \'se\', 10), (4, SUM(5), 1)'),
 	$conn->translate('INSERT INTO test %m', $array6)
 );
 
@@ -667,10 +589,7 @@ Assert::same(
 setlocale(LC_ALL, 'czech');
 
 Assert::same(
-	reformat([
-		'sqlsrv' => "UPDATE [colors] SET [color]=N'blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5",
-		"UPDATE [colors] SET [color]='blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5",
-	]),
+	reformat("UPDATE [colors] SET [color]='blue', [price]=-12.4, [spec]=-9E-005, [spec2]=1000, [spec3]=10000, [spec4]=10000 WHERE [price]=123.5"),
 
 	$conn->translate('UPDATE [colors] SET', [
 		'color' => 'blue',