From 4ceba82b9863f2c6323cbe00407e4bfbedbfc1cd Mon Sep 17 00:00:00 2001
From: wei <>
Date: Mon, 8 Oct 2007 03:24:07 +0000
Subject: Allow active records to have multiple foreign key references to the
 same table. Add TXCache.

---
 .../Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php  | 13 +++++++++++--
 1 file changed, 11 insertions(+), 2 deletions(-)

(limited to 'framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php')

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index d7278d64..d4ff07e5 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -77,8 +77,7 @@ class TActiveRecordBelongsTo extends TActiveRecordRelation
 	 */
 	protected function collectForeignObjects(&$results)
 	{
-		$fkObject = $this->getContext()->getForeignRecordFinder();
-		$fkeys = $this->findForeignKeys($this->getSourceRecord(),$fkObject);
+		$fkeys = $this->getRelationForeignKeys();
 
 		$properties = array_keys($fkeys);
 		$fields = array_values($fkeys);
@@ -87,6 +86,16 @@ class TActiveRecordBelongsTo 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($this->getSourceRecord(),$fkObject);		
+	}
 
 	/**
 	 * Sets the foreign objects to the given property on the source object.
-- 
cgit v1.2.3