RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-29 19:29:53 +03:00
Code Issues Projects Releases Wiki Activity

Browse source
This commit is contained in:
doctrine 2006-04-14 10:37:13 +00:00
parent 5607189453
commit e89a841b00
3 changed files with 20 additions and 20 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
classes/Collection/Batch.class.php
View file

@ -110,7 +110,6 @@ class Doctrine_Collection_Batch extends Doctrine_Collection {
while($row = $stmt->fetch(PDO::FETCH_ASSOC)): while($row = $stmt->fetch(PDO::FETCH_ASSOC)):
$this->table->setData($row); $this->table->setData($row);
if(is_object($this->data[$e])) { if(is_object($this->data[$e])) {
$this->data[$e]->factoryRefresh($this->table); $this->data[$e]->factoryRefresh($this->table);
} else { } else {
@ -159,7 +158,6 @@ class Doctrine_Collection_Batch extends Doctrine_Collection {
if( ! isset($this->data[$key])) if( ! isset($this->data[$key]))
$this->data[$key] = $this->table->create(); $this->data[$key] = $this->table->create();
} }

32
classes/Record.class.php
View file

@ -386,28 +386,28 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
if( ! $this->loaded) { if( ! $this->loaded) {
// no use trying to load the data from database if the Doctrine_Record is new or clean // no use trying to load the data from database if the Doctrine_Record is new or clean
if($this->state != Doctrine_Record::STATE_TDIRTY && if($this->state != Doctrine_Record::STATE_TDIRTY &&
$this->state != Doctrine_Record::STATE_TCLEAN && $this->state != Doctrine_Record::STATE_TCLEAN &&
$this->state != Doctrine_Record::STATE_CLEAN) { $this->state != Doctrine_Record::STATE_CLEAN) {
$this->loaded = true; $this->loaded = true;
if( ! empty($this->collections)) { if( ! empty($this->collections)) {
foreach($this->collections as $collection) { foreach($this->collections as $collection) {
$collection->load($this); $collection->load($this);
}
} else {
$this->refresh();
} }
} else { $this->state = Doctrine_Record::STATE_CLEAN;
$this->refresh();
} }
$this->state = Doctrine_Record::STATE_CLEAN;
} }
if(is_array($this->data[$name])) if(is_array($this->data[$name]))
return null; return null;
}
return null;
} }
return $this->data[$name]; return $this->data[$name];
} }

6
tests/run.php
View file

@ -32,13 +32,15 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase());
$test->addTestCase(new Doctrine_EventListenerTestCase()); $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_Cache_FileTestCase());
$test->addTestCase(new Doctrine_DQL_ParserTestCase());