Allow active records to have multiple foreign key references to the same table. Add TXCache.

1 files changed, 11 insertions, 3 deletions

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
index b22428ae..e5a36659 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordHasOne.php
@@ -92,9 +92,7 @@ class TActiveRecordHasOne extends TActiveRecordRelation
 	 */

 	protected function collectForeignObjects(&$results)

 	{

-		$fkObject = $this->getContext()->getForeignRecordFinder();

-		$fkeys = $this->findForeignKeys($fkObject, $this->getSourceRecord());

-

+		$fkeys = $this->getRelationForeignKeys();

 		$properties = array_values($fkeys);

 		$fields = array_keys($fkeys);

 

@@ -102,6 +100,16 @@ class TActiveRecordHasOne extends TActiveRecordRelation
 		$fkObjects = $this->findForeignObjects($fields,$indexValues);

 		$this->populateResult($results,$properties,$fkObjects,$fields);

 	}

+	

+	/**

+	 * @return array foreign key field names as key and object properties as value.

+	 * @since 3.1.2

+	 */

+	public function getRelationForeignKeys()

+	{

+		$fkObject = $this->getContext()->getForeignRecordFinder();

+		return $this->findForeignKeys($fkObject, $this->getSourceRecord());

+	}

 

 	/**

 	 * Sets the foreign objects to the given property on the source object.