This commit is contained in:
parent
5607189453
commit
e89a841b00
3 changed files with 20 additions and 20 deletions
|
@ -110,7 +110,6 @@ class Doctrine_Collection_Batch extends Doctrine_Collection {
|
|||
while($row = $stmt->fetch(PDO::FETCH_ASSOC)):
|
||||
|
||||
$this->table->setData($row);
|
||||
|
||||
if(is_object($this->data[$e])) {
|
||||
$this->data[$e]->factoryRefresh($this->table);
|
||||
} else {
|
||||
|
@ -159,7 +158,6 @@ class Doctrine_Collection_Batch extends Doctrine_Collection {
|
|||
|
||||
if( ! isset($this->data[$key]))
|
||||
$this->data[$key] = $this->table->create();
|
||||
|
||||
}
|
||||
|
||||
|
||||
|
|
|
@ -403,12 +403,12 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
|
|||
}
|
||||
$this->state = Doctrine_Record::STATE_CLEAN;
|
||||
}
|
||||
}
|
||||
|
||||
if(is_array($this->data[$name]))
|
||||
return null;
|
||||
|
||||
}
|
||||
return null;
|
||||
}
|
||||
return $this->data[$name];
|
||||
}
|
||||
if($name == "id")
|
||||
|
|
|
@ -32,13 +32,15 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase());
|
|||
|
||||
|
||||
$test->addTestCase(new Doctrine_EventListenerTestCase());
|
||||
//$test->addTestCase(new Doctrine_BatchIteratorTestCase());
|
||||
$test->addTestCase(new Doctrine_DQL_ParserTestCase());
|
||||
|
||||
$test->addTestCase(new Doctrine_BatchIteratorTestCase());
|
||||
//$test->addTestCase(new Doctrine_Cache_FileTestCase());
|
||||
|
||||
|
||||
|
||||
|
||||
$test->addTestCase(new Doctrine_DQL_ParserTestCase());
|
||||
|
||||
|
||||
|
||||
|
||||
|
|
Loading…
Add table
Reference in a new issue