Change of AR due to introduction of column mapping.

1 files changed, 3 insertions, 3 deletions

diff --git a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
index de6e5331..5a3ea50e 100644
--- a/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
+++ b/framework/Data/ActiveRecord/Relations/TActiveRecordRelation.php
@@ -110,7 +110,7 @@ abstract class TActiveRecordRelation
 	{

 		$ids=array();

 		foreach($properties as $property)

-			$ids[] = is_object($obj) ? $obj->{$property} : $obj[$property];

+			$ids[] = is_object($obj) ? $obj->getColumnValue($property) : $obj[$property];

 		return sprintf('%x',crc32(serialize($ids)));

 	}

 

@@ -142,7 +142,7 @@ abstract class TActiveRecordRelation
 		{

 			$value = array();

 			foreach($keys as $name)

-				$value[] = $result->{$name};

+				$value[] = $result->getColumnValue($name);

 			$values[] = $value;

 		}

 		return $values;

@@ -190,7 +190,7 @@ abstract class TActiveRecordRelation
 	{

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

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

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

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

 	}

 }