renamed Nette\Database\Context -> Explorer

Author: dg

readme.md

@@ -71,7 +71,7 @@ Nette Database Explorer layer helps you to fetch database data more easily and i
 
 Let's take a look at common use-case. You need to fetch books and their authors. It is common 1:N relationship. The often used implementation fetches data by one SQL query with table joins. The second possibility is to fetch data separately, run one query for getting books and then get an author for each book by another query (e.g. in your foreach cycle). This could be easily optimized to run only two queries, one for books, and another for the needed authors - and this is just the way how Nette Database Explorer does it.
 
-Selecting data starts with the table, just call `$context->table()` on the `Nette\Database\Context` object. The easiest way to get it is [described here](https://doc.nette.org/database-core#toc-configuration), but if we use Nette Database Explorer alone, it can be [manually created](https://doc.nette.org/database-explorer#toc-manual-creating-nette-database-context).
+Selecting data starts with the table, just call `$context->table()` on the `Nette\Database\Explorer` object. The easiest way to get it is [described here](https://doc.nette.org/database-core#toc-configuration), but if we use Nette Database Explorer alone, it can be [manually created](https://doc.nette.org/database-explorer#toc-manual-creating-nette-database-context).
 
 
 ```php

src/Bridges/DatabaseDI/DatabaseExtension.php

@@ -128,7 +128,7 @@ private function setupDatabase(\stdClass $config, string $name): void
 		}
 
 		$builder->addDefinition($this->prefix("$name.context"))
-			->setFactory(Nette\Database\Context::class, [$connection, $structure, $conventions])
+			->setFactory(Nette\Database\Explorer::class, [$connection, $structure, $conventions])
 			->setAutowired($config->autowired);
 
 		if ($this->name === 'database') {

src/Database/Context.php renamed to src/Database/Explorer.php

@@ -14,9 +14,9 @@
 
 
 /**
- * Database context.
+ * Database explorer.
  */
-class Context
+class Explorer
 {
 	use Nette\SmartObject;
 
@@ -172,3 +172,6 @@ public static function literal(string $value, ...$params): SqlLiteral
 		return new SqlLiteral($value, $params);
 	}
 }
+
+
+class_exists(Context::class);

src/Database/Table/GroupedSelection.php

@@ -10,7 +10,7 @@
 namespace Nette\Database\Table;
 
 use Nette;
-use Nette\Database\Context;
+use Nette\Database\Explorer;
 use Nette\Database\IConventions;
 
 
@@ -37,7 +37,7 @@ class GroupedSelection extends Selection
 	 * Creates filtered and grouped table representation.
 	 */
 	public function __construct(
-		Context $context,
+		Explorer $explorer,
 		IConventions $conventions,
 		string $tableName,
 		string $column,
@@ -46,7 +46,7 @@ public function __construct(
 	) {
 		$this->refTable = $refTable;
 		$this->column = $column;
-		parent::__construct($context, $conventions, $tableName, $cacheStorage);
+		parent::__construct($explorer, $conventions, $tableName, $cacheStorage);
 	}
 
 

src/Database/Table/Selection.php

@@ -10,7 +10,7 @@
 namespace Nette\Database\Table;
 
 use Nette;
-use Nette\Database\Context;
+use Nette\Database\Explorer;
 use Nette\Database\IConventions;
 
 
@@ -22,7 +22,7 @@ class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 {
 	use Nette\SmartObject;
 
-	/** @var Context */
+	/** @var Explorer */
 	protected $context;
 
 	/** @var IConventions */
@@ -84,20 +84,20 @@ class Selection implements \Iterator, IRowContainer, \ArrayAccess, \Countable
 	 * Creates filtered table representation.
 	 */
 	public function __construct(
-		Context $context,
+		Explorer $explorer,
 		IConventions $conventions,
 		string $tableName,
 		Nette\Caching\IStorage $cacheStorage = null
 	) {
-		$this->context = $context;
+		$this->context = $explorer;
 		$this->conventions = $conventions;
 		$this->name = $tableName;
 
 		$this->cache = $cacheStorage
-			? new Nette\Caching\Cache($cacheStorage, 'Nette.Database.' . md5($context->getConnection()->getDsn()))
+			? new Nette\Caching\Cache($cacheStorage, 'Nette.Database.' . md5($explorer->getConnection()->getDsn()))
 			: null;
 		$this->primary = $conventions->getPrimary($tableName);
-		$this->sqlBuilder = new SqlBuilder($tableName, $context);
+		$this->sqlBuilder = new SqlBuilder($tableName, $explorer);
 		$this->refCache = &$this->getRefTable($refPath)->globalRefCache[$refPath];
 	}
 

src/Database/Table/SqlBuilder.php

@@ -10,7 +10,7 @@
 namespace Nette\Database\Table;
 
 use Nette;
-use Nette\Database\Context;
+use Nette\Database\Explorer;
 use Nette\Database\IConventions;
 use Nette\Database\IStructure;
 use Nette\Database\ISupplementalDriver;
@@ -93,12 +93,12 @@ class SqlBuilder
 	private $expandingJoins = [];
 
 
-	public function __construct(string $tableName, Context $context)
+	public function __construct(string $tableName, Explorer $explorer)
 	{
 		$this->tableName = $tableName;
-		$this->driver = $context->getConnection()->getSupplementalDriver();
-		$this->conventions = $context->getConventions();
-		$this->structure = $context->getStructure();
+		$this->driver = $explorer->getConnection()->getSupplementalDriver();
+		$this->conventions = $explorer->getConventions();
+		$this->structure = $explorer->getStructure();
 		$tableNameParts = explode('.', $tableName);
 		$this->delimitedTable = implode('.', array_map([$this->driver, 'delimite'], $tableNameParts));
 		$this->checkUniqueTableName(end($tableNameParts), $tableName);

src/compatibility.php

@@ -0,0 +1,23 @@
+<?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\Explorer */
+	class Context
+	{
+	}
+
+	class Context
+	{
+	}
+} elseif (!class_exists(Context::class)) {
+	class_alias(Explorer::class, Context::class);
+}

tests/Database.DI/DatabaseExtension.basic.phpt

@@ -41,7 +41,7 @@ test('', function () {
 	Assert::same('sqlite::memory:', $connection->getDsn());
 
 	$context = $container->getService('database.default.context');
-	Assert::type(Nette\Database\Context::class, $context);
+	Assert::type(Nette\Database\Explorer::class, $context);
 	Assert::same($connection, $context->getConnection());
 
 	Assert::type(Nette\Database\Structure::class, $context->getStructure());

tests/Database.DI/DatabaseExtension.multiple.phpt

@@ -51,8 +51,8 @@ test('', function () {
 	Assert::same('sqlite::memory:', $connection->getDsn());
 
 	$context = $container->getService('database.first.context');
-	Assert::type(Nette\Database\Context::class, $context);
-	Assert::same($context, $container->getByType(Nette\Database\Context::class));
+	Assert::type(Nette\Database\Explorer::class, $context);
+	Assert::same($context, $container->getByType(Nette\Database\Explorer::class));
 	Assert::same($connection, $context->getConnection());
 
 	Assert::type(Nette\Database\Structure::class, $context->getStructure());

tests/Database/Connection.lazy.phpt

@@ -23,7 +23,7 @@ test('non lazy', function () {
 
 test('lazy', function () {
 	$connection = new Nette\Database\Connection('dsn', 'user', 'password', ['lazy' => true]);
-	$context = new Nette\Database\Context($connection, new Structure($connection, new DevNullStorage));
+	$context = new Nette\Database\Explorer($connection, new Structure($connection, new DevNullStorage));
 	Assert::exception(function () use ($context) {
 		$context->query('SELECT ?', 10);
 	}, Nette\Database\DriverException::class, '%a%valid data source %a%');