Merge pull request #436 from hrach/f-database-related

Database: implemented short related call related('table.column')
insekticid · Dec 28, 2011 · eed3b1c · eed3b1c
2 parents 797fd2c + 64b4d6b
commit eed3b1c
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 1 deletion.
diff --git a/Nette/Database/Table/ActiveRow.php b/Nette/Database/Table/ActiveRow.php
@@ -101,6 +101,10 @@ public function ref($key, $throughColumn = NULL)
 	 */
 	public function related($key, $throughColumn = NULL)
 	{
+		if (strpos($key, '.') !== FALSE) {
+			list($key, $throughColumn) = explode('.', $key);
+		}
+
 		list($table, $column) = $this->table->connection->databaseReflection->getHasManyReference($this->table->name, $key);
 		$column = $throughColumn ?: $column;
 		$referencing = $this->table->getReferencingTable($table, $column);

diff --git a/tests/Nette/Database/Table.related().phpt b/tests/Nette/Database/Table.related().phpt
@@ -15,13 +15,24 @@ require_once __DIR__ . '/connect.inc.php';
 
 $apps = array();
 foreach ($connection->table('author') as $author) {  // SELECT * FROM `author`
-	foreach ($author->related('book', 'translator_id') as $book) {  // SELECT * FROM `book` WHERE (`book`.`author_id` IN (11, 12))
+	foreach ($author->related('book', 'translator_id') as $book) {  // SELECT * FROM `book` WHERE (`book`.`translator_id` IN (11, 12))
 		$apps[$book->title] = $author->name;
 	}
+
+	foreach ($author->related('book.author_id') as $book) {  // SELECT * FROM `book` WHERE (`book`.`author_id` IN (11, 12))
+		$apps2[$book->title] = $author->name;
+	}
 }
 
 Assert::same(array(
 	'1001 tipu a triku pro PHP' => 'Jakub Vrana',
 	'Nette' => 'David Grudl',
 	'Dibi' => 'David Grudl',
 ), $apps);
+
+Assert::same(array(
+	'1001 tipu a triku pro PHP' => 'Jakub Vrana',
+	'JUSH' => 'Jakub Vrana',
+	'Nette' => 'David Grudl',
+	'Dibi' => 'David Grudl',
+), $apps2);