Changeset 153

Timestamp:

09/30/09 10:13:43 (6 months ago)

Author:

malko

Message:

- bug correction in modelCollection::get() when getting hasOne relation on foreign unique key

Files:

• trunk/class-abstractmodel.php (modified) (2 diffs)

trunk/class-abstractmodel.php

@@ -12 +12 @@
 *            - $HeadURL$
 * @changelog
+*            - 2009-09-29 - bug correction in modelCollection::__get() when getting hasOne relation on foreign unique key
 *            - 2009-07-08 - new modelCollection::slice() method
 *            - 2009-07-07 - now [r]sort can sort properties get by user defined getter (abstractmodel::getPropertyName()). (don't work for dynamic methods [r]sortPropertyname)
@@ -396 +397 @@
                         $c = modelCollection::init($hasOne[$k]['modelName']);
                         $avoidEmptyPK = abstractModel::_getModelStaticProp($c->collectionType,'_avoidEmptyPK');
+                        if( empty($hasOne[$k]['localField']) ){ //-- must be in presence of unique key field on foreign table
+                                return abstractModel::_makeModelStaticCall($hasOne[$k]['modelName'],'getFilteredInstances',array('WHERE '.$hasOne[$k]['foreignField'].' IN (?)',$this->PK));
+                        }else{
                         foreach($this->loadDatas() as $mk=>$m){
-                                $c[] = ($avoidEmptyPK && empty($m->datas[$hasOne[$k]['localField']]))?$m->{$k}:$m->datas[$hasOne[$k]['localField']];
+                                        $c[] = ( $avoidEmptyPK && empty($m->datas[$hasOne[$k]['localField']]))?$m->{$k}:$m->datas[$hasOne[$k]['localField']];
+                                }
                         }
                         return $c;