Commit e89a841b authored by doctrine's avatar doctrine

--no commit message

--no commit message
parent 56071894
...@@ -110,7 +110,6 @@ class Doctrine_Collection_Batch extends Doctrine_Collection { ...@@ -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 { ...@@ -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();
} }
......
...@@ -403,12 +403,12 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite ...@@ -403,12 +403,12 @@ abstract class Doctrine_Record extends Doctrine_Access implements Countable, Ite
} }
$this->state = Doctrine_Record::STATE_CLEAN; $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];
} }
if($name == "id") if($name == "id")
......
...@@ -32,13 +32,15 @@ $test->addTestCase(new Doctrine_ConfigurableTestCase()); ...@@ -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());
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment