Changeset 983

Timestamp:

08/14/10 02:40:01 (18 months ago)

Author:

ort

Message:

fix ORM

Location:

trunk

Files:

• classes/modules/user/User.class.php (modified) (1 diff)
• engine/classes/Engine.class.php (modified) (1 diff)
• engine/classes/EntityORM.class.php (modified) (1 diff)
• engine/classes/MapperORM.class.php (modified) (1 diff)
• engine/classes/ModuleORM.class.php (modified) (1 diff)

trunk/classes/modules/user/User.class.php

@@ -183 +183 @@
                 return $aUsers;
         }
+        
+        /**
+         * Алиас для корректной работы ORM
+         *
+         * @param unknown_type $aUserId
+         * @return unknown
+         */
+        public function GetUserItemsByArrayId($aUserId) {
+                return $this->GetUsersByArrayId($aUserId);
+        }
+        
         public function GetUsersByArrayIdSolid($aUserId) {
                 if (!is_array($aUserId)) {

trunk/engine/classes/Engine.class.php

@@ -151 +151 @@
                 if($bRunHooks || $sClassName == 'ModuleHook'){
                         $sHookPrefix = 'module_';
-                        if($sPluginName = $this->GetPluginName($sClassName)){
+                        if($sPluginName = self::GetPluginName($sClassName)) {
                                 $sHookPrefix .= "plugin{$sPluginName}_";
                         }
-                        $sHookPrefix .= $this->GetModuleName($sClassName).'_init_';
+                        $sHookPrefix .= self::GetModuleName($sClassName).'_init_';
                 }
                 

trunk/engine/classes/EntityORM.class.php

@@ -77 +77 @@
         }
         
+        public function _setData($aData) {
+                if(is_array($aData)) {
+                        foreach ($aData as $sKey => $val) {
+                                if (array_key_exists($sKey,$this->aRelations)) {
+                                        $this->aRelationsData[$sKey]=$val;
+                                } else {
+                                        $this->_aData[$sKey] = $val;
+                                }
+                        }
+                }
+        }
+        
         public function __call($sName,$aArgs) {
                 $sType=strtolower(substr($sName,0,3));

trunk/engine/classes/MapperORM.class.php

@@ -32 +32 @@
                 $sTableName = self::GetTableName($oEntity);
                 $iPrimaryKeyValue=$oEntity->_getDataOne($oEntity->_GetPrimatyKey());
-                var_dump($iPrimaryKeyValue);
+                                
                 $sql = "UPDATE ".$sTableName." SET ?a WHERE ".$oEntity->_GetPrimatyKey()." = ? "; 
                 

trunk/engine/classes/ModuleORM.class.php

@@ -104 +104 @@
                         $oEntityEmpty=Engine::GetEntity($sEntityFull);
                         $aRelations=$oEntityEmpty->_getRelations();
-                        $aEntityKeys=array();                   
+                        $aEntityKeys=array();
                         foreach ($aFilter['#with'] as $sRelationName) {
-                                if (!array_key_exists($sRelationName,$aRelations) or !in_array($aRelations[$sRelationName][0],array(EntityORM::RELATION_TYPE_BELONGS_TO,EntityORM::RELATION_TYPE_HAS_ONE))) {
+                                $sRelType=$aRelations[$sRelationName][0];
+                                $sRelEntity=$aRelations[$sRelationName][1];
+                                $sRelKey=$aRelations[$sRelationName][2];
+                                
+                                if (!array_key_exists($sRelationName,$aRelations) or !in_array($sRelType,array(EntityORM::RELATION_TYPE_BELONGS_TO,EntityORM::RELATION_TYPE_HAS_ONE))) {
                                         throw new Exception("The entity <{$sEntityFull}> not have relation <{$sRelationName}>");
                                 }
-                                
+
                                 /**
                                  * Формируем список ключей
                                  */
                                 foreach ($aEntities as $oEntity) {
-                                        $aEntityKeys[$aRelations[$sRelationName][2]][]=$oEntity->_getDataOne($aRelations[$sRelationName][2]);
+                                        $aEntityKeys[$sRelKey][]=$oEntity->_getDataOne($sRelKey);
                                 }
-                                $aEntityKeys[$aRelations[$sRelationName][2]]=array_unique($aEntityKeys[$aRelations[$sRelationName][2]]);
+                                $aEntityKeys[$sRelKey]=array_unique($aEntityKeys[$sRelKey]);
+                                
                                 /**
                                  * Делаем общий запрос по всем ключам
                                  */
+                                $oRelEntityEmpty=Engine::GetEntity($sRelEntity);
                                 
-                                $aRelData=$this->GetItemsByArray(array('id'=>$aEntityKeys[$aRelations[$sRelationName][2]]),$aRelations[$sRelationName][1]);
-                                var_dump($aRelData);
-                        }
-                        /**
-                         * Собираем набор
-                         */
+                                $sRelModuleName=Engine::GetModuleName($oRelEntityEmpty);
+                                $sRelEntityName=Engine::GetEntityName($oRelEntityEmpty);
+                                $sRelPluginPrefix=Engine::GetPluginPrefix($oRelEntityEmpty);
+                                // ItemsByArrayId - id пока идет костылем, т.к. у стандартных сущностей нет метода _GetPrimatyKey()
+                                $aRelData=Engine::GetInstance()->_CallModule("{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ItemsByArrayId",array($aEntityKeys[$sRelKey]));
+                                /**
+                                 * Собираем набор
+                                 */
+                                foreach ($aEntities as $oEntity) {
+                                        if (isset($aRelData[$oEntity->_getDataOne($sRelKey)])) {
+                                                $oEntity->_setData(array($sRelationName => $aRelData[$oEntity->_getDataOne($sRelKey)]));
+                                        }
+                                }
+                        }
                         
                 }