Merge pull request #55 from redwormik/table-ref-null

Selection::getReferencedTable always reloads when $row[$column] is NULL

Author: dg

src/Database/Table/Selection.php

@@ -846,7 +846,7 @@ public function getReferencedTable(ActiveRow $row, $table, $column = NULL)
 		$referenced = & $this->refCache['referenced'][$this->getSpecificCacheKey()]["$table.$column"];
 		$selection = & $referenced['selection'];
 		$cacheKeys = & $referenced['cacheKeys'];
-		if ($selection === NULL || !isset($cacheKeys[$checkPrimaryKey])) {
+		if ($selection === NULL || ($checkPrimaryKey !== NULL && !isset($cacheKeys[$checkPrimaryKey]))) {
 			$this->execute();
 			$cacheKeys = array();
 			foreach ($this->rows as $row) {

tests/Database/Table/Table.ref().phpt

@@ -31,3 +31,20 @@ test(function() use ($context) {
 test(function() use ($context) {
 	Assert::null($context->table('book')->get(2)->ref('author', 'translator_id'));
 });
+
+test(function() use ($context, $connection) {
+	$counter = 0;
+
+	$connection->onQuery[] = function($connection, $result) use (&$counter) {
+		$counter++;
+	};
+
+	$table = $context->table('book');
+
+	$names = array();
+	foreach ($table as $book) {
+		$translator = $book->ref('author', 'translator_id');
+	}
+
+	Assert::equal(2, $counter);
+});