This commit is contained in:
parent
89f3554d2b
commit
6ee6b36864
@ -82,10 +82,6 @@ abstract class Doctrine_Hydrate extends Doctrine_Access
|
|||||||
* @var boolean $inheritanceApplied
|
* @var boolean $inheritanceApplied
|
||||||
*/
|
*/
|
||||||
protected $inheritanceApplied = false;
|
protected $inheritanceApplied = false;
|
||||||
/**
|
|
||||||
* @var boolean $aggregate
|
|
||||||
*/
|
|
||||||
protected $aggregate = false;
|
|
||||||
/**
|
/**
|
||||||
* @var array $compAliases
|
* @var array $compAliases
|
||||||
*/
|
*/
|
||||||
@ -275,7 +271,6 @@ abstract class Doctrine_Hydrate extends Doctrine_Access
|
|||||||
"offset" => false,
|
"offset" => false,
|
||||||
);
|
);
|
||||||
$this->inheritanceApplied = false;
|
$this->inheritanceApplied = false;
|
||||||
$this->aggregate = false;
|
|
||||||
$this->joins = array();
|
$this->joins = array();
|
||||||
$this->tableIndexes = array();
|
$this->tableIndexes = array();
|
||||||
$this->tableAliases = array();
|
$this->tableAliases = array();
|
||||||
@ -368,10 +363,6 @@ abstract class Doctrine_Hydrate extends Doctrine_Access
|
|||||||
}
|
}
|
||||||
$stmt = $this->conn->execute($query, $params);
|
$stmt = $this->conn->execute($query, $params);
|
||||||
|
|
||||||
if ($this->aggregate) {
|
|
||||||
return $stmt->fetchAll(Doctrine::FETCH_ASSOC);
|
|
||||||
}
|
|
||||||
|
|
||||||
if (count($this->tables) == 0) {
|
if (count($this->tables) == 0) {
|
||||||
throw new Doctrine_Query_Exception('No components selected');
|
throw new Doctrine_Query_Exception('No components selected');
|
||||||
}
|
}
|
||||||
|
Loading…
x
Reference in New Issue
Block a user