Changeset 998

Timestamp:

08/29/10 11:03:53 (18 months ago)

Author:

ort

Message:

update ORM by ajaxy

Location:

trunk/engine/classes

Files:

• EntityORM.class.php (modified) (7 diffs)
• MapperORM.class.php (modified) (4 diffs)
• ModuleORM.class.php (modified) (7 diffs)

trunk/engine/classes/EntityORM.class.php

@@ -25 +25 @@
         const RELATION_TYPE_HAS_MANY='has_many';
         const RELATION_TYPE_HAS_ONE='has_one';
+        const RELATION_TYPE_MANY_TO_MANY='many_to_many';
         
         protected $aRelations=array();
@@ -37 +38 @@
         }
         
-        public function _GetPrimatyKey() {
+        public function _GetPrimaryKey() {
+                if(!$this->_getDataOne($this->sPrimaryKey)) {
+                        $sModulePrefix=null;
+                        if (preg_match('/Entity([^_]+)/',get_class($this),$sModulePrefix)) {                                            
+                                $sModulePrefix=func_underscore($sModulePrefix[1]).'_';
+                                if($this->_getDataOne($sModulePrefix.$this->sPrimaryKey)) {
+                                        $this->sPrimaryKey=$sModulePrefix.$this->sPrimaryKey;
+                                }
+                        }
+                }
                 return $this->sPrimaryKey;
         }
@@ -62 +72 @@
         
         public function Delete() {
+                return $this->_Method(__FUNCTION__);
+        }       
+        
+        public function Reload() {
                 return $this->_Method(__FUNCTION__);
         }
@@ -90 +104 @@
         
         public function __call($sName,$aArgs) {
-                $sType=strtolower(substr($sName,0,3));
-                if (!strpos($sName,'_') and in_array($sType,array('get','set'))) {                      
-                        $sKey=func_underscore(substr($sName,3));
+                $sType=substr($sName,0,strpos(func_underscore($sName),'_'));    
+                if (!strpos($sName,'_') and in_array($sType,array('get','set','reload'))) {     
+                        $sKey=func_underscore(str_replace($sType,'',$sName));
                         if ($sType=='get') {
                                 if (isset($this->_aData[$sKey])) {
@@ -111 +125 @@
                                         $sRelationType=$this->aRelations[$sKey][0];
                                         $sRelationKey=$this->aRelations[$sKey][2];
+                                        $sRelationJoinTable=null;
+                                        if($sRelationType == self::RELATION_TYPE_MANY_TO_MANY && array_key_exists(3, $this->aRelations[$sKey])) {
+                                                $sRelationJoinTable=$this->aRelations[$sKey][3];
+                                        }
                                         
                                         /**
@@ -119 +137 @@
                                         }
                                         
-                                        $sModuleName=Engine::GetModuleName($sEntityRel);
-                                        $sEntityName=Engine::GetEntityName($sEntityRel);
-                                        $sPluginPrefix=Engine::GetPluginPrefix($sEntityRel);
-                                        
-                                        $iPrimaryKeyValue=$this->_getDataOne($this->_GetPrimatyKey());
+                                        
+                                        $sRelModuleName=Engine::GetModuleName($sEntityRel);
+                                        $sRelEntityName=Engine::GetEntityName($sEntityRel);
+                                        $sRelPluginPrefix=Engine::GetPluginPrefix($sEntityRel);
+                                        $sRelPrimaryKey='id';
+                                        if($oRelEntity=Engine::GetEntity($sEntityRel)) {
+                                                $sRelPrimaryKey=$oRelEntity->_GetPrimaryKey();
+                                        }
+                                        
+                                        $iPrimaryKeyValue=$this->_getDataOne($this->_GetPrimaryKey());
                                         
                                         $sCmd='';
                                         $aCmdArgs=array();
                                         switch ($sRelationType) {
+                                                case self::RELATION_TYPE_BELONGS_TO :
+                                                        $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}By".func_camelize($sRelPrimaryKey);
+                                                        $aCmdArgs[0]=$this->_getDataOne($sRelationKey);
+                                                        break;
+                                                case self::RELATION_TYPE_HAS_ONE :
+                                                        $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}By".func_camelize($sRelationKey);
+                                                        $aCmdArgs[0]=$iPrimaryKeyValue;
+                                                        break;
                                                 case self::RELATION_TYPE_HAS_MANY :
-                                                        $sCmd="{$sPluginPrefix}{$sModuleName}_get{$sEntityName}ItemsBy".func_camelize($sRelationKey);
+                                                        $sCmd="{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ItemsBy".func_camelize($sRelationKey);
                                                         $aCmdArgs[0]=$iPrimaryKeyValue;
                                                         break;
-                                                case self::RELATION_TYPE_BELONGS_TO :
-                                                        $sCmd="{$sPluginPrefix}{$sModuleName}_get{$sEntityName}By".func_camelize($this->_GetPrimatyKey());
-                                                        $aCmdArgs[0]=$this->_getDataOne($sRelationKey);                                                 
-                                                case self::RELATION_TYPE_HAS_ONE :
+                                                case self::RELATION_TYPE_MANY_TO_MANY :
+                                                  $sCmd="{$sRelPluginPrefix}Module{$sRelModuleName}_get{$sRelEntityName}ItemsByJoinTable";
+                                                        $sByKey = strpos($this->_GetPrimaryKey(), $sModulePrefix) === 0 ? $this->_GetPrimaryKey() : $sModulePrefix.$this->_GetPrimaryKey();
+                                                        $aCmdArgs[0] = array(
+                                                                'join_table'                    => $sRelationJoinTable,
+                                                                'relation_key'          => $sRelationKey,
+                                                                'by_key'                                        => $sByKey,
+                                                                'by_value'                              => $iPrimaryKeyValue,
+                                                        );
+                                                        break;
                                                 default:
                                                         break;
-                                        }                                       
+                                        }
                                         $res=Engine::GetInstance()->_CallModule($sCmd,$aCmdArgs);
-                                        
+
                                         $this->aRelationsData[$sKey]=$res;
                                         return $res;
@@ -152 +189 @@
                                         $this->_aData[$sKey]=$aArgs[0];
                                 }
+                        } elseif ($sType=='reload') {
+                                if (array_key_exists($sKey,$this->aRelationsData)) {
+                                        unset($this->aRelationsData[$sKey]);
+                                        return $this->__call('get'.func_camelize($sKey),$aArgs);
+                                }
                         }
                 } else {

trunk/engine/classes/MapperORM.class.php

@@ -29 +29 @@
         }
         
-        public function UpdateEntity($oEntity) {                
+        public function UpdateEntity($oEntity) {
                 $sTableName = self::GetTableName($oEntity);
-                $iPrimaryKeyValue=$oEntity->_getDataOne($oEntity->_GetPrimatyKey());
+                $iPrimaryKeyValue=$oEntity->_getDataOne($oEntity->_GetPrimaryKey());
                                 
-                $sql = "UPDATE ".$sTableName." SET ?a WHERE ".$oEntity->_GetPrimatyKey()." = ? "; 
+                $sql = "UPDATE ".$sTableName." SET ?a WHERE ".$oEntity->_GetPrimaryKey()." = ? "; 
                 
                 return $this->oDb->query($sql,$oEntity->_getData(),$iPrimaryKeyValue);
@@ -40 +40 @@
         public function DeleteEntity($oEntity) {                
                 $sTableName = self::GetTableName($oEntity);
-                $iPrimaryKeyValue=$oEntity->_getDataOne($oEntity->_GetPrimatyKey());
+                $iPrimaryKeyValue=$oEntity->_getDataOne($oEntity->_GetPrimaryKey());
                 
-                $sql = "DELETE FROM ".$sTableName." WHERE ".$oEntity->_GetPrimatyKey()." = ? "; 
+                $sql = "DELETE FROM ".$sTableName." WHERE ".$oEntity->_GetPrimaryKey()." = ? "; 
                 return $this->oDb->query($sql,$iPrimaryKeyValue);
         }
@@ -130 +130 @@
         }
         
+        public function GetItemsByJoinTable($aData,$sEntityFull) {
+                if(empty($aData)) {
+                        return null;
+                }
+                $sTableName = self::GetTableName($sEntityFull);
+                $sql = "SELECT a.*, b.* FROM ?# a LEFT JOIN ".$sTableName." b USING(?#) WHERE a.?#=?";
+                $aItems = array();
+                if($aRows=$this->oDb->select($sql, $aData['join_table'], $aData['relation_key'],  $aData['by_key'], $aData['by_value'])) {
+                        foreach($aRows as $aRow) {
+                                $oEntity=Engine::GetEntity($sEntityFull,$aRow);
+                                $oEntity->_SetIsNew(false);
+                                $aItems[] = $oEntity;
+                        }                       
+                }
+                return $aItems;
+        }
+        
         public static function GetTableName($oEntity) {
                 /**
@@ -136 +153 @@
                  *      prefix_user_invite -> если модуль не сопадает с сущностью
                  */
-                $sModuleName = strtolower(Engine::GetModuleName($oEntity));
-                $sEntityName = strtolower(Engine::GetEntityName($oEntity));
-                if ($sModuleName==$sEntityName) {
-                        $sTable=$sModuleName;
+                $sModuleName = func_underscore(Engine::GetModuleName($oEntity));
+                $sEntityName = func_underscore(Engine::GetEntityName($oEntity));
+                if (strpos($sEntityName,$sModuleName)===0) {
+                        $sTable=func_underscore($sEntityName);
                 } else {
-                        $sTable=$sModuleName.'_'.$sEntityName;
+                        $sTable=func_underscore($sModuleName).'_'.func_underscore($sEntityName);
                 }
                 if(Config::Get('db.table.'.$sTable)) {

trunk/engine/classes/ModuleORM.class.php

@@ -41 +41 @@
                 } elseif ($res) {
                         // есть автоинкремент, устанавливаем его
-                        $oEntity->_setData(array($oEntity->_GetPrimatyKey() => $res));
+                        $oEntity->_setData(array($oEntity->_GetPrimaryKey() => $res));
                         return $oEntity;
                 }
@@ -74 +74 @@
                         return $this->_UpdateEntity($oEntity);
                 }
+        }       
+        
+        
+        protected function _ReloadEntity($oEntity) {
+                if($sPrimaryKey=$oEntity->_getPrimaryKey()) {
+                        if($sPrimaryKeyValue=$oEntity->_getDataOne($sPrimaryKey)) {
+                                if($oEntityNew=$this->GetByFilter(array($sPrimaryKey=>$sPrimaryKeyValue),Engine::GetEntityName($oEntity))) {
+                                        $oEntity->_setData($oEntityNew->_getData());
+                                        return $oEntity;
+                                }
+                        }
+                }
+                return false;
         }
         
@@ -130 +143 @@
                                 $sRelEntityName=Engine::GetEntityName($oRelEntityEmpty);
                                 $sRelPluginPrefix=Engine::GetPluginPrefix($oRelEntityEmpty);
-                                // ItemsByArrayId - id пока идет костылем, т.к. у стандартных сущностей нет метода _GetPrimatyKey()
+                                // ItemsByArrayId - id пока идет костылем, т.к. у стандартных сущностей нет метода _GetPrimaryKey()
                                 $aRelData=Engine::GetInstance()->_CallModule("{$sRelPluginPrefix}{$sRelModuleName}_get{$sRelEntityName}ItemsByArrayId",array($aEntityKeys[$sRelKey]));
                                 /**
@@ -158 +171 @@
                 foreach ($aData as $oEntity) {
                         // здесь под вопросом какое поле использовать в качестве ключа, всегда примари или тот, который передан?
-                        $aEntities[$oEntity->_getDataOne($oEntity->_GetPrimatyKey())]=$oEntity;
+                        $aEntities[$oEntity->_getDataOne($oEntity->_GetPrimaryKey())]=$oEntity;
                 }
                 return $aEntities;
         }
         
-        public function __call($sName,$aArgs) {         
+        public function GetItemsByJoinTable($aJoinData=array(),$sEntityFull=null) {
+                if (is_null($sEntityFull)) {
+                        $sEntityFull=Engine::GetPluginPrefix($this).'Module'.Engine::GetModuleName($this).'_Entity'.Engine::GetModuleName(get_class($this));
+                } elseif (!substr_count($sEntityFull,'_')) {
+                        $sEntityFull=Engine::GetPluginPrefix($this).'Module'.Engine::GetModuleName($this).'_Entity'.$sEntityFull;
+                }
+                return $this->oMapperORM->GetItemsByJoinTable($aJoinData,$sEntityFull);
+        }
+        
+        public function __call($sName,$aArgs) {
                 if (preg_match("@^add([\w]+)$@i",$sName,$aMatch)) {
                         return $this->_AddEntity($aArgs[0]);
@@ -178 +200 @@
                 if (preg_match("@^delete([\w]+)$@i",$sName,$aMatch)) {
                         return $this->_DeleteEntity($aArgs[0]);
+                }       
+                
+                if (preg_match("@^reload([\w]+)$@i",$sName,$aMatch)) {
+                        return $this->_ReloadEntity($aArgs[0]);
                 }
                 
                 $sNameUnderscore=func_underscore($sName);
-                
+                $iEntityPosEnd=strlen($sNameUnderscore)-1; 
+                if(substr_count($sNameUnderscore,'_items')) {
+                        $iEntityPosEnd=strpos($sNameUnderscore,'_items');
+                } else if(substr_count($sNameUnderscore,'_by')) {
+                        $iEntityPosEnd=strpos($sNameUnderscore,'_by');
+                } else if(substr_count($sNameUnderscore,'_all')) {
+                        $iEntityPosEnd=strpos($sNameUnderscore,'_all');
+                }
+                $sEntityName=substr($sNameUnderscore,4,$iEntityPosEnd-4);
+                /**
+                 * getUserRoleJoinByUserIdAndRoleId() get_user-role-join_by_user_id_and_role_id
+                 */
+                $sNameUnderscore=substr_replace($sNameUnderscore,str_replace('_','',$sEntityName),4,$iEntityPosEnd-4);
+                $sEntityName=func_camelize($sEntityName);
                 /**
                  * getUserItemsByArrayId() get_user_items_by_array_id
                  */
                 if (preg_match("@^get_([a-z]+)_items_by_array_([_a-z]+)$@i",$sNameUnderscore,$aMatch)) {
-                        return $this->GetItemsByArray(array($aMatch[2]=>$aArgs[0]),$aMatch[1]);
+                        return $this->GetItemsByArray(array($aMatch[2]=>$aArgs[0]),$sEntityName);
+                }
+                /**
+                 * getUserItemsByJoinTable() get_user_items_by_join_table
+                 */
+                if (preg_match("@^get_([a-z]+)_items_by_join_table$@i",$sNameUnderscore,$aMatch)) {
+                        return $this->GetItemsByJoinTable($aArgs[0],func_camelize($sEntityName));
                 }
                 /**
@@ -198 +243 @@
                         $aFilter=array_combine(explode('_and_',$aMatch[5]),$aArgs);
                         if ($aMatch[2]=='_items') {
-                                return $this->GetItemsByFilter($aFilter,$aMatch[1]);
+                                return $this->GetItemsByFilter($aFilter,$sEntityName);
                         } else {                                
-                                return $this->GetByFilter($aFilter,$aMatch[1]);
+                                return $this->GetByFilter($aFilter,$sEntityName);
                         }
                 }
@@ -211 +256 @@
                                 $aFilter=$aArgs[0];
                         }
-                        return $this->GetItemsByFilter($aFilter,$aMatch[1]);
+                        return $this->GetItemsByFilter($aFilter,$sEntityName);
                 }