Released version 4.1.2

- https://www.php.net/manual/en/function.pg-pconnect.php

.travis.yml

@@ -46,12 +46,8 @@ jobs:
 
 
         -   stage: Static Analysis (informative)
-            install:
-                # Install PHPStan
-                - travis_retry composer create-project phpstan/phpstan-shim temp/phpstan --no-progress
-                - travis_retry composer install --no-progress --prefer-dist
             script:
-                - php temp/phpstan/phpstan.phar analyse --autoload-file vendor/autoload.php --level 5 src
+                - composer run-script phpstan
 
 
         -   stage: Code Coverage

composer.json

@@ -3,7 +3,7 @@
 	"description": "Dibi is Database Abstraction Library for PHP",
 	"keywords": ["database", "dbal", "mysql", "postgresql", "sqlite", "mssql", "sqlsrv", "oracle", "access", "pdo", "odbc"],
 	"homepage": "https://dibiphp.com",
-	"license": ["BSD-3-Clause", "GPL-2.0", "GPL-3.0"],
+	"license": ["BSD-3-Clause", "GPL-2.0-only", "GPL-3.0-only"],
 	"authors": [
 		{
 			"name": "David Grudl",
@@ -15,7 +15,8 @@
 	},
 	"require-dev": {
 		"tracy/tracy": "~2.2",
-		"nette/tester": "~2.0"
+		"nette/tester": "~2.0",
+		"phpstan/phpstan": "^0.12"
 	},
 	"replace": {
 		"dg/dibi": "*"
@@ -23,6 +24,10 @@
 	"autoload": {
 		"classmap": ["src/"]
 	},
+	"scripts": {
+		"phpstan": "phpstan analyse --autoload-file vendor/autoload.php --level 5 src",
+		"tester": "tester tests -s"
+	},
 	"extra": {
 		"branch-alias": {
 			"dev-master": "4.1-dev"

examples/using-logger.php

@@ -20,6 +20,7 @@ $dibi = new Dibi\Connection([
 	// enable query logging to this file
 	'profiler' => [
 		'file' => 'log/log.sql',
+		'errorsOnly' => false,
 	],
 ]);
 

readme.md

@@ -199,6 +199,7 @@ Three special modifiers are available for LIKE:
 | `%like~` | the expression starts with a string
 | `%~like` | the expression ends with a string
 | `%~like~` | the expression contains a string
+| `%like` | the expression matches a string
 
 Search for names beginning with a string:
 

src/Dibi/Connection.php

@@ -51,6 +51,7 @@ class Connection implements IConnection
 	 *   - profiler (array)
 	 *       - run (bool) => enable profiler?
 	 *       - file => file to log
+	 *       - errorsOnly (bool) => log only errors
 	 *   - substitutes (array) => map of driver specific substitutes (under development)
 	 *   - onConnect (array) => list of SQL queries to execute (by Connection::query()) after connection is established
 	 * @throws Exception
@@ -70,7 +71,8 @@ class Connection implements IConnection
 		// profiler
 		if (isset($config['profiler']['file']) && (!isset($config['profiler']['run']) || $config['profiler']['run'])) {
 			$filter = $config['profiler']['filter'] ?? Event::QUERY;
-			$this->onEvent[] = [new Loggers\FileLogger($config['profiler']['file'], $filter), 'logEvent'];
+			$errorsOnly = $config['profiler']['errorsOnly'] ?? false;
+			$this->onEvent[] = [new Loggers\FileLogger($config['profiler']['file'], $filter, $errorsOnly), 'logEvent'];
 		}
 
 		$this->substitutes = new HashMap(function (string $expr) { return ":$expr:"; });
@@ -108,6 +110,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 +127,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 +154,7 @@ class Connection implements IConnection
 	{
 		if ($this->driver) {
 			$this->driver->disconnect();
-			$this->driver = null;
+			$this->driver = $this->translator = null;
 		}
 	}
 
@@ -250,11 +255,7 @@ class Connection implements IConnection
 		if (!$this->driver) {
 			$this->connect();
 		}
-		if (!$this->translator) {
+		return (clone $this->translator)->translate($args);
-			$this->translator = new Translator($this);
-		}
-		$translator = clone $this->translator;
-		return $translator->translate($args);
 	}
 
 

src/Dibi/Drivers/FirebirdDriver.php

@@ -40,9 +40,7 @@ class FirebirdDriver implements Dibi\Driver
 	private $inTransaction = false;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('interbase')) {
@@ -271,7 +269,7 @@ class FirebirdDriver implements Dibi\Driver
 	public function escapeLike(string $value, int $pos): string
 	{
 		$value = addcslashes($this->escapeText($value), '%_\\');
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
 	}
 
 

src/Dibi/Drivers/MySqliDriver.php

@@ -47,9 +47,7 @@ class MySqliDriver implements Dibi\Driver
 	private $buffered;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('mysqli')) {
@@ -317,7 +315,7 @@ class MySqliDriver implements Dibi\Driver
 	public function escapeLike(string $value, int $pos): string
 	{
 		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 	}
 
 

src/Dibi/Drivers/OdbcDriver.php

@@ -37,9 +37,7 @@ class OdbcDriver implements Dibi\Driver
 	private $microseconds = true;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('odbc')) {
@@ -250,7 +248,7 @@ class OdbcDriver implements Dibi\Driver
 	public function escapeLike(string $value, int $pos): string
 	{
 		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 	}
 
 

src/Dibi/Drivers/OracleDriver.php

@@ -42,9 +42,7 @@ class OracleDriver implements Dibi\Driver
 	private $affectedRows;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('oci8')) {
@@ -270,7 +268,7 @@ class OracleDriver implements Dibi\Driver
 	{
 		$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
 		$value = str_replace("'", "''", $value);
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 	}
 
 

src/Dibi/Drivers/PdoDriver.php

@@ -42,9 +42,7 @@ class PdoDriver implements Dibi\Driver
 	private $serverVersion = '';
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('pdo')) {
@@ -324,29 +322,29 @@ class PdoDriver implements Dibi\Driver
 		switch ($this->driverName) {
 			case 'mysql':
 				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\n\r\\'%_");
-				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 
 			case 'oci':
 				$value = addcslashes(str_replace('\\', '\\\\', $value), "\x00\\%_");
 				$value = str_replace("'", "''", $value);
-				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+				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 <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 
 			case 'sqlite':
 				$value = addcslashes(substr($this->connection->quote($value, PDO::PARAM_STR), 1, -1), '%_\\');
-				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
 
 			case 'odbc':
 			case 'mssql':
 			case 'dblib':
 			case 'sqlsrv':
 				$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-				return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+				return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 
 			default:
 				throw new Dibi\NotImplementedException;

src/Dibi/Drivers/PostgreDriver.php

@@ -35,9 +35,7 @@ class PostgreDriver implements Dibi\Driver
 	private $affectedRows;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('pgsql')) {
@@ -71,7 +69,7 @@ class PostgreDriver implements Dibi\Driver
 			if (empty($config['persistent'])) {
 				$this->connection = pg_connect($string, PGSQL_CONNECT_FORCE_NEW);
 			} else {
-				$this->connection = pg_pconnect($string, PGSQL_CONNECT_FORCE_NEW);
+				$this->connection = pg_pconnect($string);
 			}
 			restore_error_handler();
 		}
@@ -318,7 +316,7 @@ class PostgreDriver implements Dibi\Driver
 		$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 <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 	}
 
 

src/Dibi/Drivers/SqliteDriver.php

@@ -37,9 +37,7 @@ class SqliteDriver implements Dibi\Driver
 	private $fmtDateTime;
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('sqlite3')) {
@@ -254,7 +252,7 @@ class SqliteDriver implements Dibi\Driver
 	public function escapeLike(string $value, int $pos): string
 	{
 		$value = addcslashes($this->connection->escapeString($value), '%_\\');
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'") . " ESCAPE '\\'";
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'") . " ESCAPE '\\'";
 	}
 
 

src/Dibi/Drivers/SqlsrvDriver.php

@@ -39,9 +39,7 @@ class SqlsrvDriver implements Dibi\Driver
 	private $version = '';
 
 
-	/**
+	/** @throws Dibi\NotSupportedException */
-	 * @throws Dibi\NotSupportedException
-	 */
 	public function __construct(array $config)
 	{
 		if (!extension_loaded('sqlsrv')) {
@@ -243,7 +241,7 @@ class SqlsrvDriver implements Dibi\Driver
 	public function escapeLike(string $value, int $pos): string
 	{
 		$value = strtr($value, ["'" => "''", '%' => '[%]', '_' => '[_]', '[' => '[[]']);
-		return ($pos <= 0 ? "'%" : "'") . $value . ($pos >= 0 ? "%'" : "'");
+		return ($pos & 1 ? "'%" : "'") . $value . ($pos & 2 ? "%'" : "'");
 	}
 
 

src/Dibi/Helpers.php

@@ -201,9 +201,7 @@ class Helpers
 	}
 
 
-	/**
+	/** @internal */
-	 * @internal
-	 */
 	public static function getTypeCache(): HashMap
 	{
 		if (self::$types === null) {
@@ -279,18 +277,14 @@ class Helpers
 	}
 
 
-	/**
+	/** @internal */
-	 * @internal
-	 */
 	public static function false2Null($val)
 	{
 		return $val === false ? null : $val;
 	}
 
 
-	/**
+	/** @internal */
-	 * @internal
-	 */
 	public static function intVal($value): int
 	{
 		if (is_int($value)) {

src/Dibi/Loggers/FileLogger.php

@@ -25,11 +25,15 @@ class FileLogger
 	/** @var int */
 	public $filter;
 
+	/** @var bool */
+	private $errorsOnly;
 
-	public function __construct(string $file, int $filter = null)
+
+	public function __construct(string $file, int $filter = null, bool $errorsOnly = false)
 	{
 		$this->file = $file;
 		$this->filter = $filter ?: Dibi\Event::QUERY;
+		$this->errorsOnly = $errorsOnly;
 	}
 
 
@@ -38,39 +42,41 @@ class FileLogger
 	 */
 	public function logEvent(Dibi\Event $event): void
 	{
-		if (($event->type & $this->filter) === 0) {
+		if (
+			(($event->type & $this->filter) === 0)
+			|| ($this->errorsOnly === true && !$event->result instanceof \Exception)
+		) {
 			return;
 		}
 
-		$handle = fopen($this->file, 'a');
-		if (!$handle) {
-			return; // or throw exception?
-		}
-		flock($handle, LOCK_EX);
-
 		if ($event->result instanceof \Exception) {
 			$message = $event->result->getMessage();
 			if ($code = $event->result->getCode()) {
 				$message = "[$code] $message";
 			}
-			fwrite($handle,
+			$this->writeToFile(
+				$event,
 				"ERROR: $message"
-				. "\n-- SQL: " . $event->sql
+					. "\n-- SQL: " . $event->sql
-				. "\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
-				. ";\n-- " . date('Y-m-d H:i:s')
-				. "\n\n"
 			);
 		} else {
-			fwrite($handle,
+			$this->writeToFile(
+				$event,
 				'OK: ' . $event->sql
-				. ($event->count ? ";\n-- rows: " . $event->count : '')
+					. ($event->count ? ";\n-- rows: " . $event->count : '')
-				. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
+					. "\n-- takes: " . sprintf('%0.3f ms', $event->time * 1000)
-				. "\n-- source: " . implode(':', $event->source)
+					. "\n-- source: " . implode(':', $event->source)
-				. "\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
-				. "\n-- " . date('Y-m-d H:i:s')
-				. "\n\n"
 			);
 		}
-		fclose($handle);
+	}
+
+
+	private function writeToFile(Dibi\Event $event, string $message): void
+	{
+		$message .=
+			"\n-- driver: " . $event->connection->getConfig('driver') . '/' . $event->connection->getConfig('name')
+			. "\n-- " . date('Y-m-d H:i:s')
+			. "\n\n";
+		file_put_contents($this->file, $message, FILE_APPEND | LOCK_EX);
 	}
 }

src/Dibi/Reflection/Column.php

@@ -106,18 +106,14 @@ class Column
 	}
 
 
-	/**
+	/** @return mixed */
-	 * @return mixed
-	 */
 	public function getDefault()
 	{
 		return $this->info['default'] ?? null;
 	}
 
 
-	/**
+	/** @return mixed */
-	 * @return mixed
-	 */
 	public function getVendorInfo(string $key)
 	{
 		return $this->info['vendor'][$key] ?? null;

src/Dibi/Reflection/Database.php

@@ -46,9 +46,7 @@ class Database
 	}
 
 
-	/**
+	/** @return Table[] */
-	 * @return Table[]
-	 */
 	public function getTables(): array
 	{
 		$this->init();
@@ -56,9 +54,7 @@ class Database
 	}
 
 
-	/**
+	/** @return string[] */
-	 * @return string[]
-	 */
 	public function getTableNames(): array
 	{
 		$this->init();

src/Dibi/Reflection/Result.php

@@ -38,9 +38,7 @@ class Result
 	}
 
 
-	/**
+	/** @return Column[] */
-	 * @return Column[]
-	 */
 	public function getColumns(): array
 	{
 		$this->initColumns();
@@ -48,9 +46,7 @@ class Result
 	}
 
 
-	/**
+	/** @return string[] */
-	 * @return string[]
-	 */
 	public function getColumnNames(bool $fullNames = false): array
 	{
 		$this->initColumns();

src/Dibi/Reflection/Table.php

@@ -69,9 +69,7 @@ class Table
 	}
 
 
-	/**
+	/** @return Column[] */
-	 * @return Column[]
-	 */
 	public function getColumns(): array
 	{
 		$this->initColumns();
@@ -79,9 +77,7 @@ class Table
 	}
 
 
-	/**
+	/** @return string[] */
-	 * @return string[]
-	 */
 	public function getColumnNames(): array
 	{
 		$this->initColumns();
@@ -113,9 +109,7 @@ class Table
 	}
 
 
-	/**
+	/** @return ForeignKey[] */
-	 * @return ForeignKey[]
-	 */
 	public function getForeignKeys(): array
 	{
 		$this->initForeignKeys();
@@ -123,9 +117,7 @@ class Table
 	}
 
 
-	/**
+	/** @return Index[] */
-	 * @return Index[]
-	 */
 	public function getIndexes(): array
 	{
 		$this->initIndexes();

src/Dibi/Result.php

@@ -296,9 +296,7 @@ class Result implements IDataSource
 	}
 
 
-	/**
+	/** @deprecated */
-	 * @deprecated
-	 */
 	private function oldFetchAssoc(string $assoc)
 	{
 		$this->seek(0);
@@ -569,9 +567,7 @@ class Result implements IDataSource
 	}
 
 
-	/**
+	/** @return Reflection\Column[] */
-	 * @return Reflection\Column[]
-	 */
 	final public function getColumns(): array
 	{
 		return $this->getInfo()->getColumns();

src/Dibi/Translator.php

@@ -415,12 +415,15 @@ final class Translator
 					return (string) $value;
 
 				case 'like~':  // LIKE string%
-					return $this->driver->escapeLike($value, 1);
+					return $this->driver->escapeLike($value, 2);
 
 				case '~like':  // LIKE %string
-					return $this->driver->escapeLike($value, -1);
+					return $this->driver->escapeLike($value, 1);
 
 				case '~like~': // LIKE %string%
+					return $this->driver->escapeLike($value, 3);
+
+				case 'like': // LIKE string
 					return $this->driver->escapeLike($value, 0);
 
 				case 'and':

src/Dibi/dibi.php

@@ -44,7 +44,7 @@ class dibi
 
 	/** version */
 	public const
-		VERSION = '4.1.0';
+		VERSION = '4.1.2';
 
 	/** sorting order */
 	public const

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/Translator.like.phpt

@@ -71,3 +71,9 @@ Assert::truthy($conn->fetchSingle('SELECT ? LIKE %~like~', 'baa', 'aa'));
 Assert::truthy($conn->fetchSingle('SELECT ? LIKE %~like~', 'aab', 'aa'));
 Assert::falsey($conn->fetchSingle('SELECT ? LIKE %~like~', 'bba', '%a'));
 Assert::truthy($conn->fetchSingle('SELECT ? LIKE %~like~', 'b%a', '%a'));
+
+
+// matches
+Assert::truthy($conn->fetchSingle('SELECT ? LIKE %like', 'a', 'a'));
+Assert::falsey($conn->fetchSingle('SELECT ? LIKE %like', 'a', 'aa'));
+Assert::falsey($conn->fetchSingle('SELECT ? LIKE %like', 'a', 'b'));