renamed ISupplementalDriver -> Driver

dg · dg · commit e28bf02899a5 · 2020-11-25T21:12:13.000+01:00
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -33,7 +33,7 @@ class Connection
 	/** @var array */
 	private $options;
 
-	/** @var ISupplementalDriver */
+	/** @var Driver */
 	private $driver;
 
 	/** @var SqlPreprocessor */
@@ -106,7 +106,7 @@ public function getPdo(): PDO
 	}
 
 
-	public function getSupplementalDriver(): ISupplementalDriver
+	public function getSupplementalDriver(): Driver
 	{
 		$this->connect();
 		return $this->driver;
diff --git a/src/Database/Driver.php b/src/Database/Driver.php
@@ -13,7 +13,7 @@
 /**
  * Supplemental PDO database driver.
  */
-interface ISupplementalDriver
+interface Driver
 {
 	public const
 		SUPPORT_SEQUENCE = 'sequence',
@@ -95,3 +95,6 @@ function getColumnTypes(\PDOStatement $statement): array;
 	 */
 	function isSupported(string $item): bool;
 }
+
+
+interface_exists(ISupplementalDriver::class);
diff --git a/src/Database/Drivers/MsSqlDriver.php b/src/Database/Drivers/MsSqlDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental MS SQL database driver.
  */
-class MsSqlDriver implements Nette\Database\ISupplementalDriver
+class MsSqlDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/MySqlDriver.php b/src/Database/Drivers/MySqlDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental MySQL database driver.
  */
-class MySqlDriver implements Nette\Database\ISupplementalDriver
+class MySqlDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/OciDriver.php b/src/Database/Drivers/OciDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental Oracle database driver.
  */
-class OciDriver implements Nette\Database\ISupplementalDriver
+class OciDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/OdbcDriver.php b/src/Database/Drivers/OdbcDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental ODBC database driver.
  */
-class OdbcDriver implements Nette\Database\ISupplementalDriver
+class OdbcDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/PgSqlDriver.php b/src/Database/Drivers/PgSqlDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental PostgreSQL database driver.
  */
-class PgSqlDriver implements Nette\Database\ISupplementalDriver
+class PgSqlDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/SqliteDriver.php b/src/Database/Drivers/SqliteDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental SQLite3 database driver.
  */
-class SqliteDriver implements Nette\Database\ISupplementalDriver
+class SqliteDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/Drivers/SqlsrvDriver.php b/src/Database/Drivers/SqlsrvDriver.php
@@ -15,7 +15,7 @@
 /**
  * Supplemental SQL Server 2005 and later database driver.
  */
-class SqlsrvDriver implements Nette\Database\ISupplementalDriver
+class SqlsrvDriver implements Nette\Database\Driver
 {
 	use Nette\SmartObject;
 
diff --git a/src/Database/SqlPreprocessor.php b/src/Database/SqlPreprocessor.php
@@ -53,7 +53,7 @@ class SqlPreprocessor
 	/** @var Connection */
 	private $connection;
 
-	/** @var ISupplementalDriver */
+	/** @var Driver */
 	private $driver;
 
 	/** @var array of input parameters */
@@ -220,7 +220,7 @@ private function formatValue($value, string $mode = null): string
 						}
 						$vx[] = implode(', ', $vx2);
 					}
-					$select = $this->driver->isSupported(ISupplementalDriver::SUPPORT_MULTI_INSERT_AS_SELECT);
+					$select = $this->driver->isSupported(Driver::SUPPORT_MULTI_INSERT_AS_SELECT);
 					return '(' . implode(', ', $kx) . ($select ? ') SELECT ' : ') VALUES (')
 						. implode($select ? ' UNION ALL SELECT ' : '), (', $vx) . ($select ? '' : ')');
 				}
diff --git a/src/Database/Structure.php b/src/Database/Structure.php
@@ -100,7 +100,7 @@ public function getPrimaryKeySequence(string $table): ?string
 		$this->needStructure();
 		$table = $this->resolveFQTableName($table);
 
-		if (!$this->connection->getSupplementalDriver()->isSupported(ISupplementalDriver::SUPPORT_SEQUENCE)) {
+		if (!$this->connection->getSupplementalDriver()->isSupported(Driver::SUPPORT_SEQUENCE)) {
 			return null;
 		}
 
diff --git a/src/Database/Table/SqlBuilder.php b/src/Database/Table/SqlBuilder.php
@@ -10,10 +10,10 @@
 namespace Nette\Database\Table;
 
 use Nette;
+use Nette\Database\Driver;
 use Nette\Database\Explorer;
 use Nette\Database\IConventions;
 use Nette\Database\IStructure;
-use Nette\Database\ISupplementalDriver;
 use Nette\Database\SqlLiteral;
 
 
@@ -80,7 +80,7 @@ class SqlBuilder
 	/** @var string currently parsing alias for joins */
 	protected $currentAlias;
 
-	/** @var ISupplementalDriver */
+	/** @var Driver */
 	private $driver;
 
 	/** @var IStructure */
@@ -160,7 +160,7 @@ public function getSelectQueryHash(array $columns = null): string
 			$parts[] = $this->select;
 		} elseif ($columns) {
 			$parts[] = [$this->delimitedTable, $columns];
-		} elseif ($this->group && !$this->driver->isSupported(ISupplementalDriver::SUPPORT_SELECT_UNGROUPED_COLUMNS)) {
+		} elseif ($this->group && !$this->driver->isSupported(Driver::SUPPORT_SELECT_UNGROUPED_COLUMNS)) {
 			$parts[] = [$this->group];
 		} else {
 			$parts[] = "{$this->delimitedTable}.*";
@@ -210,7 +210,7 @@ function ($col) { return "$this->tableName.$col"; },
 			}
 			$querySelect = $this->buildSelect($cols);
 
-		} elseif ($this->group && !$this->driver->isSupported(ISupplementalDriver::SUPPORT_SELECT_UNGROUPED_COLUMNS)) {
+		} elseif ($this->group && !$this->driver->isSupported(Driver::SUPPORT_SELECT_UNGROUPED_COLUMNS)) {
 			$querySelect = $this->buildSelect([$this->group]);
 			$this->parseJoins($joins, $querySelect);
 
@@ -361,7 +361,7 @@ protected function addCondition($condition, array $params, array &$conditions, a
 						}
 					}
 
-					if ($this->driver->isSupported(ISupplementalDriver::SUPPORT_SUBSELECT)) {
+					if ($this->driver->isSupported(Driver::SUPPORT_SUBSELECT)) {
 						$arg = null;
 						$subSelectPlaceholderCount = substr_count($clone->getSql(), '?');
 						$replace = $match[2][0] . '(' . $clone->getSql() . (!$subSelectPlaceholderCount && count($clone->getSqlBuilder()->getParameters()) === 1 ? ' ?' : '') . ')';
@@ -629,7 +629,7 @@ public function parseJoinsCb(&$joins, $match): string
 		$parentAlias = preg_replace('#^(.*\.)?(.*)$#', '$2', $this->tableName);
 
 		// join schema keyMatch and table keyMatch to schema.table keyMatch
-		if ($this->driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA) && count($keyMatches) > 1) {
+		if ($this->driver->isSupported(Driver::SUPPORT_SCHEMA) && count($keyMatches) > 1) {
 			$tables = $this->getCachedTableList();
 			if (
 				!isset($tables[$keyMatches[0]['key']])
@@ -787,7 +787,7 @@ protected function addConditionComposition(
 		array &$conditions,
 		array &$conditionsParameters
 	): bool {
-		if ($this->driver->isSupported(ISupplementalDriver::SUPPORT_MULTI_COLUMN_AS_OR_COND)) {
+		if ($this->driver->isSupported(Driver::SUPPORT_MULTI_COLUMN_AS_OR_COND)) {
 			$conditionFragment = '(' . implode(' = ? AND ', $columns) . ' = ?) OR ';
 			$condition = substr(str_repeat($conditionFragment, count($parameters)), 0, -4);
 			return $this->addCondition($condition, [Nette\Utils\Arrays::flatten($parameters)], $conditions, $conditionsParameters);
diff --git a/src/compatibility-intf.php b/src/compatibility-intf.php
@@ -0,0 +1,19 @@
+<?php
+
+/**
+ * This file is part of the Nette Framework (https://nette.org)
+ * Copyright (c) 2004 David Grudl (https://davidgrudl.com)
+ */
+
+declare(strict_types=1);
+
+namespace Nette\Database;
+
+if (false) {
+	/** @deprecated use Nette\Database\Driver */
+	interface ISupplementalDriver
+	{
+	}
+} elseif (!interface_exists(ISupplementalDriver::class)) {
+	class_alias(Driver::class, ISupplementalDriver::class);
+}
diff --git a/tests/Database/Reflection.phpt b/tests/Database/Reflection.phpt
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Tester\Assert;
 
 require __DIR__ . '/connect.inc.php'; // create $connection
@@ -20,7 +20,7 @@ $tables = $driver->getTables();
 $tables = array_filter($tables, function ($t) { return in_array($t['name'], ['author', 'book', 'book_tag', 'tag'], true); });
 usort($tables, function ($a, $b) { return strcmp($a['name'], $b['name']); });
 
-if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 	Assert::same(
 		[
 			['name' => 'author', 'view' => false, 'fullName' => 'public.author'],
diff --git a/tests/Database/Structure.phpt b/tests/Database/Structure.phpt
@@ -46,7 +46,7 @@ class StructureTestCase extends TestCase
 	protected function setUp()
 	{
 		parent::setUp();
-		$this->driver = Mockery::mock(Nette\Database\ISupplementalDriver::class);
+		$this->driver = Mockery::mock(Nette\Database\Driver::class);
 		$this->connection = Mockery::mock(Nette\Database\Connection::class);
 		$this->storage = Mockery::mock(Nette\Caching\IStorage::class);
 
diff --git a/tests/Database/Structure.schemas.phpt b/tests/Database/Structure.schemas.phpt
@@ -46,7 +46,7 @@ class StructureSchemasTestCase extends TestCase
 	protected function setUp()
 	{
 		parent::setUp();
-		$this->driver = Mockery::mock(Nette\Database\ISupplementalDriver::class);
+		$this->driver = Mockery::mock(Nette\Database\Driver::class);
 		$this->connection = Mockery::mock(Nette\Database\Connection::class);
 		$this->storage = Mockery::mock(Nette\Caching\IStorage::class);
 
diff --git a/tests/Database/Table/SqlBuilder.addAlias().phpt b/tests/Database/Table/SqlBuilder.addAlias().phpt
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Nette\Database\Table\SqlBuilder;
 use Tester\Assert;
 
@@ -33,7 +33,7 @@ $driver = $connection->getSupplementalDriver();
 
 
 test('test duplicated table names throw exception', function () use ($explorer, $driver) {
-	$authorTable = ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA) ? 'public.' : '') . 'author';
+	$authorTable = ($driver->isSupported(Driver::SUPPORT_SCHEMA) ? 'public.' : '') . 'author';
 	$sqlBuilder = new SqlBuilderMock($authorTable, $explorer);
 	$sqlBuilder->addAlias(':book(translator)', 'book1');
 	$sqlBuilder->addAlias(':book:book_tag', 'book2');
@@ -82,7 +82,7 @@ test('test same table chain with another alias', function () use ($explorer, $dr
 
 
 test('test nested alias', function () use ($explorer, $driver) {
-	$sqlBuilder = $driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)
+	$sqlBuilder = $driver->isSupported(Driver::SUPPORT_SCHEMA)
 		? new SqlBuilderMock('public.author', $explorer)
 		: new SqlBuilderMock('author', $explorer);
 	$sqlBuilder->addAlias(':book(translator)', 'translated_book');
@@ -91,7 +91,7 @@ test('test nested alias', function () use ($explorer, $driver) {
 	$joins = [];
 	$sqlBuilder->parseJoins($joins, $query);
 	$join = $sqlBuilder->buildQueryJoins($joins);
-	if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+	if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 		Assert::same(
 			'LEFT JOIN book translated_book ON author.id = translated_book.translator_id ' .
 			'LEFT JOIN public.book next ON translated_book.next_volume = next.id',
diff --git a/tests/Database/Table/SqlBuilder.addWhere().phpt b/tests/Database/Table/SqlBuilder.addWhere().phpt
@@ -8,7 +8,7 @@
 declare(strict_types=1);
 
 use Nette\Database\Conventions\DiscoveredConventions;
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Nette\Database\SqlLiteral;
 use Nette\Database\Table\SqlBuilder;
 use Tester\Assert;
@@ -75,7 +75,7 @@ test('test more ActiveRow as a parameter', function () use ($explorer) {
 test('test Selection with parameters as a parameter', function () use ($explorer) {
 	$sqlBuilder = new SqlBuilder('book', $explorer);
 	$sqlBuilder->addWhere('id', $explorer->table('book')->having('COUNT(:book_tag.tag_id) >', 1));
-	$schemaSupported = $explorer->getConnection()->getSupplementalDriver()->isSupported(ISupplementalDriver::SUPPORT_SCHEMA);
+	$schemaSupported = $explorer->getConnection()->getSupplementalDriver()->isSupported(Driver::SUPPORT_SCHEMA);
 	Assert::equal(reformat([
 		'SELECT * FROM [book] WHERE ([id] IN (SELECT [id] FROM [book] LEFT JOIN ' . ($schemaSupported ? '[public].[book_tag] ' : '') . '[book_tag] ON [book].[id] = [book_tag].[book_id] HAVING COUNT([book_tag].[tag_id]) > ?))',
 	]), $sqlBuilder->buildSelectQuery());
diff --git a/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt b/tests/Database/Table/SqlBuilder.parseJoinConditions().phpt
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Nette\Database\Table\SqlBuilder;
 use Tester\Assert;
 
@@ -74,7 +74,7 @@ test('', function () use ($explorer, $driver) {
 	$leftJoinConditions = $sqlBuilder->parseJoinConditions($joins, $sqlBuilder->buildJoinConditions());
 	$join = $sqlBuilder->buildQueryJoins($joins, $leftJoinConditions);
 
-	if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+	if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 		Assert::same(
 			'LEFT JOIN book ON author.id = book.translator_id AND (book.id > ?) ' .
 			'LEFT JOIN public.book_tag_alt book_tag_alt ON book.id = book_tag_alt.book_id AND (book_tag_alt.state = ?)',
diff --git a/tests/Database/Table/SqlBuilder.parseJoins().phpt b/tests/Database/Table/SqlBuilder.parseJoins().phpt
@@ -8,7 +8,7 @@
 declare(strict_types=1);
 
 use Nette\Database\Conventions\DiscoveredConventions;
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Nette\Database\Table\SqlBuilder;
 use Tester\Assert;
 
@@ -44,7 +44,7 @@ Assert::same('WHERE priorit.id IS NULL', $query);
 
 $tables = $connection->getSupplementalDriver()->getTables();
 if (!in_array($tables[0]['name'], ['npriorities', 'ntopics', 'nusers', 'nusers_ntopics', 'nusers_ntopics_alt'], true)) {
-	if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+	if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 		Assert::same(
 			'LEFT JOIN public.nUsers_nTopics nusers_ntopics ON nUsers.nUserId = nusers_ntopics.nUserId ' .
 			'LEFT JOIN public.nTopics topic ON nusers_ntopics.nTopicId = topic.nTopicId ' .
@@ -87,7 +87,7 @@ Assert::same(
 );
 
 
-$sqlBuilder = $driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)
+$sqlBuilder = $driver->isSupported(Driver::SUPPORT_SCHEMA)
 	? new SqlBuilderMock('public.book', $explorer)
 	: new SqlBuilderMock('book', $explorer);
 
@@ -97,7 +97,7 @@ $sqlBuilder->parseJoins($joins, $query);
 $join = $sqlBuilder->buildQueryJoins($joins);
 Assert::same('WHERE book_ref.translator_id IS NULL AND book_ref_ref.translator_id IS NULL', $query);
 
-if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 	Assert::same(
 		'LEFT JOIN public.book book_ref ON book.id = book_ref.next_volume ' .
 		'LEFT JOIN public.book book_ref_ref ON book_ref.id = book_ref_ref.next_volume',
diff --git a/tests/Database/Table/Table.backjoin.phpt b/tests/Database/Table/Table.backjoin.phpt
@@ -7,7 +7,7 @@
 
 declare(strict_types=1);
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Tester\Assert;
 
 require __DIR__ . '/../connect.inc.php'; // create $connection
@@ -39,7 +39,7 @@ test('', function () use ($explorer) {
 test('', function () use ($explorer, $driver) {
 	$authorsSelection = $explorer->table('author')->where(':book.translator_id IS NOT NULL')->wherePrimary(12);
 
-	if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+	if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 		Assert::same(
 			reformat('SELECT [author].* FROM [author] LEFT JOIN [public].[book] [book] ON [author].[id] = [book].[author_id] WHERE ([book].[translator_id] IS NOT NULL) AND ([author].[id] = ?)'),
 			$authorsSelection->getSql()
diff --git a/tests/Database/Table/Table.join-condition.phpt b/tests/Database/Table/Table.join-condition.phpt
@@ -7,15 +7,15 @@
 
 declare(strict_types=1);
 
-use Nette\Database\ISupplementalDriver;
+use Nette\Database\Driver;
 use Tester\Assert;
 
 require __DIR__ . '/../connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../files/{$driverName}-nette_test1.sql");
 $driver = $connection->getSupplementalDriver();
 test('', function () use ($explorer, $driver) {
-	$schema = $driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)
+	$schema = $driver->isSupported(Driver::SUPPORT_SCHEMA)
 		? '[public].'
 		: '';
 	$sql = $explorer->table('book')->joinWhere('translator', 'translator.name', 'Geek')->select('book.*')->getSql();
@@ -34,7 +34,7 @@ test('', function () use ($explorer, $driver) {
 		->where('tag.name', 'PHP')
 		->group('tag.name')
 		->getSql();
-	if ($driver->isSupported(ISupplementalDriver::SUPPORT_SCHEMA)) {
+	if ($driver->isSupported(Driver::SUPPORT_SCHEMA)) {
 		Assert::same(
 			reformat(
 				'SELECT [tag].[name], COUNT([book].[id]) AS [count_of_next_volume_written_by_younger_author] FROM [tag] ' .
diff --git a/tests/Database/Table/Table.join.phpt b/tests/Database/Table/Table.join.phpt

Original file line number	Diff line number	Diff line change
`@@ -33,7 +33,7 @@ class Connection`
`33`	`33`	`/** @var array */`
`34`	`34`	`private $options;`
`35`	`35`
`36`		`- /** @var ISupplementalDriver */`
	`36`	`+ /** @var Driver */`
`37`	`37`	`private $driver;`
`38`	`38`
`39`	`39`	`/** @var SqlPreprocessor */`
`@@ -106,7 +106,7 @@ public function getPdo(): PDO`
`106`	`106`	`}`
`107`	`107`
`108`	`108`
`109`		`- public function getSupplementalDriver(): ISupplementalDriver`
	`109`	`+ public function getSupplementalDriver(): Driver`
`110`	`110`	`{`
`111`	`111`	`$this->connect();`
`112`	`112`	`return $this->driver;`
Original file line number	Diff line number	Diff line change
`@@ -15,7 +15,7 @@`
`15`	`15`	`/**`
`16`	`16`	`* Supplemental MS SQL database driver.`
`17`	`17`	`*/`
`18`		`-class MsSqlDriver implements Nette\Database\ISupplementalDriver`
	`18`	`+class MsSqlDriver implements Nette\Database\Driver`
`19`	`19`	`{`
`20`	`20`	`use Nette\SmartObject;`
`21`	`21`
Original file line number	Diff line number	Diff line change
`@@ -53,7 +53,7 @@ class SqlPreprocessor`
`53`	`53`	`/** @var Connection */`
`54`	`54`	`private $connection;`
`55`	`55`
`56`		`- /** @var ISupplementalDriver */`
	`56`	`+ /** @var Driver */`
`57`	`57`	`private $driver;`
`58`	`58`
`59`	`59`	`/** @var array of input parameters */`
`@@ -220,7 +220,7 @@ private function formatValue($value, string $mode = null): string`
`220`	`220`	`}`
`221`	`221`	`$vx[] = implode(', ', $vx2);`
`222`	`222`	`}`
`223`		`- $select = $this->driver->isSupported(ISupplementalDriver::SUPPORT_MULTI_INSERT_AS_SELECT);`
	`223`	`+ $select = $this->driver->isSupported(Driver::SUPPORT_MULTI_INSERT_AS_SELECT);`
`224`	`224`	`return '(' . implode(', ', $kx) . ($select ? ') SELECT ' : ') VALUES (')`
`225`	`225`	`. implode($select ? ' UNION ALL SELECT ' : '), (', $vx) . ($select ? '' : ')');`
`226`	`226`	`}`