Merge pull request #66 from matej21/fix/active_row_infinite_recursion

Table: fixed infinite recursion

Author: dg

src/Database/Table/ActiveRow.php

@@ -313,13 +313,17 @@ public function __unset($key)
 	}
 
 
-	protected function accessColumn($key, $selectColumn = TRUE)
+	/**
+	 * @internal
+	 */
+	public function accessColumn($key, $selectColumn = TRUE)
 	{
 		$this->table->accessColumn($key, $selectColumn);
 		if ($this->table->getDataRefreshed() && !$this->dataRefreshed) {
 			$this->data = $this->table[$this->getSignature()]->data;
 			$this->dataRefreshed = TRUE;
 		}
+		return array_key_exists($key, $this->data);
 	}
 
 

src/Database/Table/Selection.php

@@ -840,6 +840,9 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
 			}
 			list($table, $column) = $belongsTo;
 		}
+		if (!$row->accessColumn($column)) {
+			return FALSE;
+		}
 
 		$checkPrimaryKey = $row[$column];
 

tests/Database/Table/bugs/staticReflection.undeclaredColumn.phpt

@@ -0,0 +1,24 @@
+<?php
+
+/**
+ * Test: Nette\Database\Table & StaticConventions: bug causing infinite recursion
+ * @dataProvider? ../../databases.ini
+ */
+
+use Tester\Assert;
+
+require __DIR__ . '/../../connect.inc.php'; // create $connection
+
+$conventions = new \Nette\Database\Conventions\StaticConventions();
+$cacheStorage = new \Nette\Caching\Storages\MemoryStorage();
+$context = new \Nette\Database\Context($context->getConnection(), $context->getStructure(), $conventions, $cacheStorage);
+
+Nette\Database\Helpers::loadFromFile($connection, __DIR__ . "/../../files/{$driverName}-nette_test1.sql");
+
+
+test(function() use ($context) {
+	$book = $context->table('book')->where('id = ?', 1)->fetch();
+	Assert::exception(function () use ($book) {
+		$book->unknown_column;
+	}, 'Nette\MemberAccessException', "Cannot read an undeclared column 'unknown_column'.");
+});