mirror of
https://github.com/Oreolek/ifhub.club.git
synced 2024-07-05 16:04:24 +03:00
fix ORM
This commit is contained in:
parent
2750a2a512
commit
9b8139e407
|
@ -121,31 +121,7 @@ class MapperORM extends Mapper {
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
$aFilterFields=array();
|
list($aFilterFields,$sFilterFields)=$this->BuildFilter($aFilter,$oEntitySample);
|
||||||
foreach ($aFilter as $k=>$v) {
|
|
||||||
if (substr($k,0,1)=='#') {
|
|
||||||
|
|
||||||
} else {
|
|
||||||
$aFilterFields[$oEntitySample->_getField($k)]=$v;
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
$sFilterFields='';
|
|
||||||
|
|
||||||
foreach ($aFilterFields as $k => $v) {
|
|
||||||
$aK=explode(' ',trim($k));
|
|
||||||
$sFieldCurrent=$aK[0];
|
|
||||||
$sConditionCurrent=' = ';
|
|
||||||
if (count($aK)>1) {
|
|
||||||
$sConditionCurrent=strtolower($aK[1]);
|
|
||||||
}
|
|
||||||
if ($sConditionCurrent=='in') {
|
|
||||||
$sFilterFields.=" and $sFieldCurrent $sConditionCurrent ( ?a ) ";
|
|
||||||
} else {
|
|
||||||
$sFilterFields.=" and $sFieldCurrent $sConditionCurrent ? ";
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
$sql = "SELECT * FROM ".$sTableName." WHERE 1=1 {$sFilterFields} {$sOrder} {$sLimit} ";
|
$sql = "SELECT * FROM ".$sTableName." WHERE 1=1 {$sFilterFields} {$sOrder} {$sLimit} ";
|
||||||
$aQueryParams=array_merge(array($sql),array_values($aFilterFields));
|
$aQueryParams=array_merge(array($sql),array_values($aFilterFields));
|
||||||
|
@ -165,6 +141,17 @@ class MapperORM extends Mapper {
|
||||||
$oEntitySample=Engine::GetEntity($sEntityFull);
|
$oEntitySample=Engine::GetEntity($sEntityFull);
|
||||||
$sTableName = self::GetTableName($sEntityFull);
|
$sTableName = self::GetTableName($sEntityFull);
|
||||||
|
|
||||||
|
list($aFilterFields,$sFilterFields)=$this->BuildFilter($aFilter,$oEntitySample);
|
||||||
|
|
||||||
|
$sql = "SELECT count(*) as c FROM ".$sTableName." WHERE 1=1 {$sFilterFields} ";
|
||||||
|
$aQueryParams=array_merge(array($sql),array_values($aFilterFields));
|
||||||
|
if($aRow=call_user_func_array(array($this->oDb,'selectRow'),$aQueryParams)) {
|
||||||
|
return $aRow['c'];
|
||||||
|
}
|
||||||
|
return 0;
|
||||||
|
}
|
||||||
|
|
||||||
|
public function BuildFilter($aFilter,$oEntitySample) {
|
||||||
$aFilterFields=array();
|
$aFilterFields=array();
|
||||||
foreach ($aFilter as $k=>$v) {
|
foreach ($aFilter as $k=>$v) {
|
||||||
if (substr($k,0,1)=='#') {
|
if (substr($k,0,1)=='#') {
|
||||||
|
@ -175,17 +162,21 @@ class MapperORM extends Mapper {
|
||||||
}
|
}
|
||||||
|
|
||||||
$sFilterFields='';
|
$sFilterFields='';
|
||||||
if (count($aFilterFields)) {
|
foreach ($aFilterFields as $k => $v) {
|
||||||
$sFilterFields=' and '.implode(' = ? and ',array_keys($aFilterFields)).' = ? ';
|
$aK=explode(' ',trim($k));
|
||||||
|
$sFieldCurrent=$aK[0];
|
||||||
|
$sConditionCurrent=' = ';
|
||||||
|
if (count($aK)>1) {
|
||||||
|
$sConditionCurrent=strtolower($aK[1]);
|
||||||
}
|
}
|
||||||
$sql = "SELECT count(*) as c FROM ".$sTableName." WHERE 1=1 {$sFilterFields} ";
|
if ($sConditionCurrent=='in') {
|
||||||
$aQueryParams=array_merge(array($sql),array_values($aFilterFields));
|
$sFilterFields.=" and $sFieldCurrent $sConditionCurrent ( ?a ) ";
|
||||||
if($aRow=call_user_func_array(array($this->oDb,'selectRow'),$aQueryParams)) {
|
} else {
|
||||||
return $aRow['c'];
|
$sFilterFields.=" and $sFieldCurrent $sConditionCurrent ? ";
|
||||||
}
|
}
|
||||||
return 0;
|
|
||||||
}
|
}
|
||||||
|
return array($aFilterFields,$sFilterFields);
|
||||||
|
}
|
||||||
|
|
||||||
public function GetItemsByArray($aFilter,$sEntityFull) {
|
public function GetItemsByArray($aFilter,$sEntityFull) {
|
||||||
$oEntitySample=Engine::GetEntity($sEntityFull);
|
$oEntitySample=Engine::GetEntity($sEntityFull);
|
||||||
|
|
Loading…
Reference in a new issue