Active Record now supports implicitly declared related properties

3 files changed, 20 insertions, 49 deletions

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
index d4ff07e5..805739c1 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordBelongsTo.php
@@ -81,12 +81,11 @@ class TActiveRecordBelongsTo extends TActiveRecordRelation
 

 		$properties = array_keys($fkeys);

 		$fields = array_values($fkeys);

-

 		$indexValues = $this->getIndexValues($properties, $results);

 		$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

@@ -94,7 +93,7 @@ class TActiveRecordBelongsTo extends TActiveRecordRelation
 	public function getRelationForeignKeys()

 	{

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

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

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

 	}

 

 	/**

@@ -110,7 +109,7 @@ class TActiveRecordBelongsTo extends TActiveRecordRelation
 		{

 			if(count($collections[$hash]) > 1)

 				throw new TActiveRecordException('ar_belongs_to_multiple_result');

-			$source->setColumnValue($prop, $collections[$hash][0]);

+			$source->$prop=$collections[$hash][0];

 		}

 	}

 

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index 8e9cc9b5..5bde4898 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -41,7 +41,7 @@ abstract class TActiveRecordRelation
 	{

 		return $this->_context;

 	}

-	

+

 	/**

 	 * @return TActiveRecordCriteria

 	 */

@@ -58,6 +58,8 @@ abstract class TActiveRecordRelation
 		return $this->getContext()->getSourceRecord();

 	}

 

+	abstract protected function collectForeignObjects(&$results);

+

 	/**

 	 * Dispatch the method calls to the source record finder object. When

 	 * an instance of TActiveRecord or an array of TActiveRecord is returned

@@ -85,7 +87,7 @@ abstract class TActiveRecordRelation
 			array_push($stack,$this); //call it later

 		return $results;

 	}

-	

+

 	/**

 	 * Fetch results for current relationship.

 	 * @return boolean always true.

@@ -125,13 +127,13 @@ abstract class TActiveRecordRelation
 		throw new TActiveRecordException('ar_relations_missing_fk',

 			$tableInfo->getTableFullName(), $matching);

 	}

-	

+

 	/**

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

-	 * @since 3.1.2	 

+	 * @since 3.1.2

 	 */

 	abstract public function getRelationForeignKeys();

-	

+

 	/**

 	 * Find matching foreign key fields from the 3rd element of an entry in TActiveRecord::$RELATION.

 	 * Assume field names consist of [\w-] character sets. Prefix to the field names ending with a dot

@@ -238,7 +240,7 @@ abstract class TActiveRecordRelation
 	{

 		$hash = $this->getObjectHash($source, $properties);

 		$prop = $this->getContext()->getProperty();

-		$source->setColumnValue($prop, isset($collections[$hash]) ? $collections[$hash] : array());

+		$source->$prop=isset($collections[$hash]) ? $collections[$hash] : array();

 	}

 }

 

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
index d83aa63a..8bc4362f 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelationContext.php
@@ -25,46 +25,16 @@
  */

 class TActiveRecordRelationContext

 {

-	/**

-	 * static property name in TActiveRecord that defines the record relationships.

-	 */

-	const RELATIONS_CONST = 'RELATIONS';

-

 	private $_property;

-	private $_sourceRecord;

+	private $_record;

 	private $_relation; //data from an entry of TActiveRecord::$RELATION

 	private $_fkeys;

 

-	public function __construct($source, $property=null)

-	{

-		$this->_sourceRecord=$source;

-		if($property!==null)

-			list($this->_property, $this->_relation) = $this->getSourceRecordRelation($property);

-	}

-

-	/**

-	 * Uses ReflectionClass to obtain the relation details array of a given

-	 * property from the $RELATIONS static property in TActiveRecord.

-	 * @param string relation property name

-	 * @return array array($propertyName, $relation) relation definition.

-	 */

-	protected function getSourceRecordRelation($property)

-	{

-		$property = strtolower($property);

-		foreach($this->getRecordRelationships() as $name => $relation)

-		{

-			if(strtolower($name)===$property)

-				return array($name, $relation);

-		}

-	}

-

-	/**

-	 * @return array the key and values of TActiveRecord::$RELATIONS

-	 */

-	public function getRecordRelationships()

+	public function __construct($record, $property=null, $relation=null)

 	{

-		$class = new ReflectionClass($this->_sourceRecord);

-		return $class->getStaticPropertyValue(self::RELATIONS_CONST);

+		$this->_record=$record;

+		$this->_property=$property;

+		$this->_relation=$relation;

 	}

 

 	/**

@@ -95,7 +65,7 @@ class TActiveRecordRelationContext
 	 */

 	public function getSourceRecord()

 	{

-		return $this->_sourceRecord;

+		return $this->_record;

 	}

 

 	/**

@@ -183,7 +153,7 @@ class TActiveRecordRelationContext
 		if(!$this->hasRecordRelation())

 		{

 			throw new TActiveRecordException('ar_undefined_relation_prop',

-				$property, get_class($this->_sourceRecord), self::RELATIONS_CONST);

+				$this->_property, get_class($this->_record), 'RELATIONS');

 		}

 		if($criteria===null)

 			$criteria = new TActiveRecordCriteria;

@@ -212,7 +182,7 @@ class TActiveRecordRelationContext
 	public function updateAssociatedRecords($updateBelongsTo=false)

 	{

 		$success=true;

-		foreach($this->getRecordRelationships() as $property=>$relation)

+		foreach($this->_record->getRelations() as $property=>$relation)

 		{

 			$belongsTo = $relation[0]==TActiveRecord::BELONGS_TO;

 			if(($updateBelongsTo && $belongsTo) || (!$updateBelongsTo && !$belongsTo))

@@ -220,7 +190,7 @@ class TActiveRecordRelationContext
 				$obj = $this->getSourceRecord();

 				if(!$this->isEmptyFkObject($obj->getColumnValue($property)))

 				{

-					$context = new self($this->getSourceRecord(),$property);

+					$context = new TActiveRecordRelationContext($this->getSourceRecord(),$property,$relation);

 					$success = $context->getRelationHandler()->updateAssociatedRecords() && $success;

 				}

 			}