Database: SelectionFactory renamed to Context (BC break)

nette · Nov 20, 2013 · ffa9efe · ffa9efe
1 parent c6d5415
commit ffa9efe
Show file tree

Hide file tree

Showing 21 changed files with 34 additions and 34 deletions.
diff --git a/src/Database/Connection.php b/src/Database/Connection.php
@@ -38,8 +38,8 @@ class Connection extends Nette\Object
 	/** @var SqlPreprocessor */
 	private $preprocessor;
 
-	/** @var SelectionFactory */
-	private $selectionFactory;
+	/** @var Context */
+	private $context;
 
 	/** @var PDO */
 	private $pdo;
@@ -256,41 +256,41 @@ public static function literal($value)
 	/** @deprecated */
 	public function table($table)
 	{
-		trigger_error(__METHOD__ . '() is deprecated; use SelectionFactory::table() instead.', E_USER_DEPRECATED);
-		if (!$this->selectionFactory) {
-			$this->selectionFactory = new SelectionFactory($this);
+		trigger_error(__METHOD__ . '() is deprecated; use Context::table() instead.', E_USER_DEPRECATED);
+		if (!$this->context) {
+			$this->context = new Context($this);
 		}
-		return $this->selectionFactory->table($table);
+		return $this->context->table($table);
 	}
 
 
 	/** @deprecated */
-	public function setSelectionFactory(SelectionFactory $selectionFactory)
+	public function setContext(Context $context)
 	{
-		$this->selectionFactory = $selectionFactory;
+		$this->context = $context;
 		return $this;
 	}
 
 
 	/** @deprecated */
-	public function getSelectionFactory()
+	public function getContext()
 	{
-		return $this->selectionFactory;
+		return $this->context;
 	}
 
 
 	/** @deprecated */
 	function setDatabaseReflection()
 	{
-		trigger_error(__METHOD__ . '() is deprecated; use setSelectionFactory() instead.', E_USER_DEPRECATED);
+		trigger_error(__METHOD__ . '() is deprecated; use setContext() instead.', E_USER_DEPRECATED);
 		return $this;
 	}
 
 
 	/** @deprecated */
 	function setCacheStorage()
 	{
-		trigger_error(__METHOD__ . '() is deprecated; use setSelectionFactory() instead.', E_USER_DEPRECATED);
+		trigger_error(__METHOD__ . '() is deprecated; use setContext() instead.', E_USER_DEPRECATED);
 	}
 
 

diff --git a/src/Database/SelectionFactory.php → src/Database/Context.php b/src/Database/SelectionFactory.php → src/Database/Context.php
@@ -15,11 +15,11 @@
 
 
 /**
- * Table\Selection factory.
+ * Database context.
  *
  * @author     David Grudl
  */
-class SelectionFactory extends Nette\Object
+class Context extends Nette\Object
 {
 	/** @var Connection */
 	private $connection;

diff --git a/tests/Database/GroupedSelection.insert().phpt b/tests/Database/GroupedSelection.insert().phpt
@@ -14,7 +14,7 @@ require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
 
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/Selection.insert().multi.phpt b/tests/Database/Selection.insert().multi.phpt
@@ -12,7 +12,7 @@
 require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/Selection.insert().phpt b/tests/Database/Selection.insert().phpt
@@ -74,7 +74,7 @@ Assert::equal(4, $dao->table('book')->where('title LIKE', "Biography%")->count('
 
 
 // Insert into table without primary key
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/SqlBuilder.addWhere().phpt b/tests/Database/SqlBuilder.addWhere().phpt
@@ -19,7 +19,7 @@ use Nette\Database\Table\SqlBuilder;
 
 
 $reflection = new DiscoveredReflection($connection);
-$dao = new Nette\Database\SelectionFactory($connection, $reflection);
+$dao = new Nette\Database\Context($connection, $reflection);
 
 
 test(function() use ($connection, $reflection) { // test paramateres with NULL
@@ -214,7 +214,7 @@ test(function() use ($driverName, $connection, $reflection) {
 	}
 
 	$reflection = new DiscoveredReflection($connection);
-	$dao = new Nette\Database\SelectionFactory($connection, $reflection);
+	$dao = new Nette\Database\Context($connection, $reflection);
 
 	$e = Assert::exception(function() use ($dao) {
 		$books = $dao->table('book')->where('id',

diff --git a/tests/Database/Table.basic.camelCase.phpt b/tests/Database/Table.basic.camelCase.phpt
@@ -12,7 +12,7 @@
 require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test2.sql");
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/Table.basic.phpt b/tests/Database/Table.basic.phpt
@@ -75,7 +75,7 @@ test(function() use ($dao) {
 
 
 test(function() use ($connection, $dao) {
-	$dao = new Nette\Database\SelectionFactory(
+	$dao = new Nette\Database\Context(
 		$connection,
 		new Nette\Database\Reflection\DiscoveredReflection($connection)
 	);

diff --git a/tests/Database/Table.cache.observer.phpt b/tests/Database/Table.cache.observer.phpt
@@ -49,7 +49,7 @@ class CacheMock implements Nette\Caching\IStorage
 }
 
 $cacheStorage = new CacheMock;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, new Nette\Caching\Storages\MemoryStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.cache.observer2.phpt b/tests/Database/Table.cache.observer2.phpt
@@ -27,7 +27,7 @@ class CacheMock extends MemoryStorage
 	}
 }
 
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, new Nette\Caching\Storages\MemoryStorage),
 	($cacheStorage = new CacheMock)

diff --git a/tests/Database/Table.cache.phpt b/tests/Database/Table.cache.phpt
@@ -15,7 +15,7 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 
 
 $cacheStorage = new Nette\Caching\Storages\MemoryStorage;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, $cacheStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.cache.rows.phpt b/tests/Database/Table.cache.rows.phpt
@@ -13,7 +13,7 @@ require __DIR__ . '/connect.inc.php'; // create $connection
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
 
 $cacheStorage = new Nette\Caching\Storages\MemoryStorage;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, $cacheStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.cache2.phpt b/tests/Database/Table.cache2.phpt
@@ -14,7 +14,7 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 
 
 $cacheStorage = new Nette\Caching\Storages\MemoryStorage;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, $cacheStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.columnRefetch.phpt b/tests/Database/Table.columnRefetch.phpt
@@ -14,7 +14,7 @@ Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName
 
 
 $cacheStorage = new Nette\Caching\Storages\MemoryStorage;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, $cacheStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.discoveredReflection.phpt b/tests/Database/Table.discoveredReflection.phpt
@@ -12,7 +12,7 @@
 require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/Table.join.phpt b/tests/Database/Table.join.phpt
@@ -61,7 +61,7 @@ test(function() use ($dao) {
 
 
 test(function() use ($connection) {
-	$dao = new Nette\Database\SelectionFactory(
+	$dao = new Nette\Database\Context(
 		$connection,
 		new Nette\Database\Reflection\DiscoveredReflection($connection)
 	);

diff --git a/tests/Database/Table.multi-primary-key.phpt b/tests/Database/Table.multi-primary-key.phpt
@@ -12,7 +12,7 @@ require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
 $cacheStorage = new Nette\Caching\Storages\MemoryStorage;
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection, $cacheStorage),
 	$cacheStorage

diff --git a/tests/Database/Table.placeholders.phpt b/tests/Database/Table.placeholders.phpt
@@ -19,7 +19,7 @@ use Nette\Database\Table\SqlBuilder;
 
 
 $reflection = new DiscoveredReflection($connection);
-$dao = new Nette\Database\SelectionFactory($connection, $reflection);
+$dao = new Nette\Database\Context($connection, $reflection);
 
 
 test(function() use ($dao, $driverName) {

diff --git a/tests/Database/Table.self-reference.phpt b/tests/Database/Table.self-reference.phpt
@@ -14,7 +14,7 @@ use Nette\Database;
 require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/Table.update().phpt b/tests/Database/Table.update().phpt
@@ -12,7 +12,7 @@
 require __DIR__ . '/connect.inc.php'; // create $connection
 
 Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/files/{$driverName}-nette_test1.sql");
-$dao = new Nette\Database\SelectionFactory(
+$dao = new Nette\Database\Context(
 	$connection,
 	new Nette\Database\Reflection\DiscoveredReflection($connection)
 );

diff --git a/tests/Database/connect.inc.php b/tests/Database/connect.inc.php
@@ -29,7 +29,7 @@
 	Tester\Environment::lock($options['dsn'], dirname(TEMP_DIR));
 }
 $driverName = $connection->getPdo()->getAttribute(PDO::ATTR_DRIVER_NAME);
-$dao = new Nette\Database\SelectionFactory($connection);
+$dao = new Nette\Database\Context($connection);
 
 
 /** Replaces [] with driver-specific quotes */