Support for use tablename acquired as regclass at previous query in PostgreSQL (prevent to "delimite" two times)

.github/funding.yml

@@ -0,0 +1,2 @@
+github: dg
+custom: "https://nette.org/donate"

.travis.yml

@@ -1,6 +1,5 @@
 language: php
 php:
-    - 7.1
     - 7.2
     - 7.3
     - 7.4

appveyor.yml

@@ -22,7 +22,7 @@ install:
     - IF EXIST c:\php (SET PHP=0) ELSE (SET PHP=1)
     - IF %PHP%==1 mkdir c:\php
     - IF %PHP%==1 cd c:\php
-    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.1.5-Win32-VC14-x64.zip --output php.zip
+    - IF %PHP%==1 curl https://windows.php.net/downloads/releases/archives/php-7.2.28-Win32-VC15-x64.zip --output php.zip
     - IF %PHP%==1 7z x php.zip >nul
     - IF %PHP%==1 echo extension_dir=ext >> php.ini
     - IF %PHP%==1 echo extension=php_openssl.dll >> php.ini

composer.json

@@ -15,7 +15,7 @@
 		}
 	],
 	"require": {
-		"php": ">=7.1",
+		"php": ">=7.2",
 		"ext-pdo": "*",
 		"nette/caching": "^3.0",
 		"nette/utils": "^3.1"
@@ -40,7 +40,7 @@
 	},
 	"extra": {
 		"branch-alias": {
-			"dev-master": "3.0-dev"
+			"dev-master": "3.1-dev"
 		}
 	}
 }

readme.md

@@ -33,7 +33,7 @@ The recommended way to install is via Composer:
 composer require nette/database
 ```
 
-It requires PHP version 7.1 and supports PHP up to 7.4.
+It requires PHP version 7.2 and supports PHP up to 7.4.
 
 
 Usage

src/Bridges/DatabaseTracy/ConnectionPanel.php

@@ -34,6 +34,9 @@ class ConnectionPanel implements Tracy\IBarPanel
 	/** @var bool */
 	public $disabled = false;
 
+	/** @var float */
+	public $performanceScale = 0.25;
+
 	/** @var float logged time */
 	private $totalTime = 0;
 
@@ -46,11 +49,11 @@ class ConnectionPanel implements Tracy\IBarPanel
 
 	public function __construct(Connection $connection)
 	{
-		$connection->onQuery[] = [$this, 'logQuery'];
+		$connection->onQuery[] = \Closure::fromCallable([$this, 'logQuery']);
 	}
 
 
-	public function logQuery(Connection $connection, $result): void
+	private function logQuery(Connection $connection, $result): void
 	{
 		if ($this->disabled) {
 			return;
@@ -137,6 +140,7 @@ public function getPanel(): ?string
 			$name = $this->name;
 			$count = $this->count;
 			$totalTime = $this->totalTime;
+			$performanceScale = $this->performanceScale;
 			require __DIR__ . '/templates/ConnectionPanel.panel.phtml';
 		});
 	}

src/Bridges/DatabaseTracy/templates/ConnectionPanel.panel.phtml

@@ -29,7 +29,7 @@ use Tracy\Helpers;
 			[$connection, $sql, $params, $source, $time, $rows, $error, $command, $explain] = $query;
 		?>
 		<tr>
-		<td>
+		<td style="background:rgba(255, 95, 23, <?= sprintf('%0.3f', log($time * 1000 + 1, 10) * $performanceScale) ?>)">
 		<?php if ($error): ?>
 			<span title="<?= Helpers::escapeHtml($error) ?>">ERROR</span>
 		<?php elseif ($time !== null): echo sprintf('%0.3f', $time * 1000); endif ?>

src/Database/Connection.php

@@ -152,6 +152,23 @@ public function rollBack(): void
 	}
 
 
+	/**
+	 * @return mixed
+	 */
+	public function transaction(callable $callback)
+	{
+		$this->beginTransaction();
+		try {
+			$res = $callback();
+		} catch (\Throwable $e) {
+			$this->rollBack();
+			throw $e;
+		}
+		$this->commit();
+		return $res;
+	}
+
+
 	/**
 	 * Generates and executes SQL query.
 	 */

src/Database/Context.php

@@ -60,6 +60,15 @@ public function rollBack(): void
 	}
 
 
+	/**
+	 * @return mixed
+	 */
+	public function transaction(callable $callback)
+	{
+		return $this->connection->transaction($callback);
+	}
+
+
 	public function getInsertId(string $sequence = null): string
 	{
 		return $this->connection->getInsertId($sequence);

src/Database/Drivers/MsSqlDriver.php

@@ -45,6 +45,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?<!\])\](?!\])#', '', preg_replace('#(?<!\[)\[(?!\[)#', '', $name));
+		return str_replace(['[[', ']]'], ['[', ']'], $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format("'Y-m-d H:i:s'");

src/Database/Drivers/MySqlDriver.php

@@ -78,6 +78,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?<!`)`(?!`)#', '', $name);
+		return str_replace('``', '`', $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format("'Y-m-d H:i:s'");

src/Database/Drivers/OciDriver.php

@@ -61,6 +61,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?<!")"(?!")#', '', $name);
+		return str_replace('""', '"', $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format($this->fmtDateTime);

src/Database/Drivers/OdbcDriver.php

@@ -39,6 +39,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?<!\])\](?!\])#', '', preg_replace('#(?<!\[)\[(?!\[)#', '', $name));
+		return str_replace(['[[', ']]'], ['[', ']'], $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format('#m/d/Y H:i:s#');

src/Database/Drivers/PgSqlDriver.php

@@ -63,6 +63,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?<!")"(?!")#', '', $name);
+    return str_replace('""', '"', $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format("'Y-m-d H:i:s'");

src/Database/Drivers/SqliteDriver.php

@@ -74,6 +74,14 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?:^|\.)\[#', '', $name);
+		// Can not be fully undelimited due to ambigious delimite() - was delimited "[x  x]" name originally "x  x" or "x[]x"?
+		return $name;
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		return $value->format($this->fmtDateTime);

src/Database/Drivers/SqlsrvDriver.php

@@ -49,6 +49,13 @@ public function delimite(string $name): string
 	}
 
 
+	public function undelimite(string $name): string
+	{
+		$name = preg_replace('#(?:^|\.)\[#', '', $name);
+		return str_replace(']]', ']', $name);
+	}
+
+
 	public function formatDateTime(\DateTimeInterface $value): string
 	{
 		/** @see https://msdn.microsoft.com/en-us/library/ms187819.aspx */

src/Database/Helpers.php

@@ -33,6 +33,7 @@ class Helpers
 		'DATE' => IStructure::FIELD_DATE,
 		'(SMALL)?DATETIME(OFFSET)?\d*|TIME(STAMP.*)?' => IStructure::FIELD_DATETIME,
 		'BYTEA|(TINY|MEDIUM|LONG|)BLOB|(LONG )?(VAR)?BINARY|IMAGE' => IStructure::FIELD_BINARY,
+		'REGCLASS' => IStructure::FIELD_TABLENAME,
 	];
 
 

src/Database/IStructure.php

@@ -25,7 +25,8 @@ interface IStructure
 		FIELD_TIME = 'time',
 		FIELD_DATETIME = 'datetime',
 		FIELD_UNIX_TIMESTAMP = 'timestamp',
-		FIELD_TIME_INTERVAL = 'timeint';
+		FIELD_TIME_INTERVAL = 'timeint',
+		FIELD_TABLENAME = 'regclass';
 
 	/**
 	 * Returns tables list.

src/Database/ISupplementalDriver.php

@@ -38,6 +38,11 @@ function convertException(\PDOException $e): DriverException;
 	 */
 	function delimite(string $name): string;
 
+	/**
+	 * Undelimites identifier as reverse operation for delimite (for example to get not delimited table name).
+	 */
+	function undelimite(string $name): string;
+
 	/**
 	 * Formats date-time for use in a SQL statement.
 	 */

src/Database/ResultSet.php

@@ -161,6 +161,9 @@ public function normalizeRow(array $row): array
 
 			} elseif ($type === IStructure::FIELD_UNIX_TIMESTAMP) {
 				$row[$key] = Nette\Utils\DateTime::from($value);
+
+			} elseif ($type === IStructure::FIELD_TABLENAME) {
+				$row[$key] = $this->connection->getSupplementalDriver()->undelimite($value);
 			}
 		}