Commit ead84035 authored by zYne's avatar zYne

--no commit message

--no commit message
parent c4b3a18a
......@@ -900,12 +900,12 @@ abstract class Doctrine_Connection extends Doctrine_Configurable implements Coun
$class = $name . 'Table';
if (class_exists($class) && in_array('Doctrine_Table', class_parents($class))) {
$table = new $class($name, $this);
$table = new $class($name, $this, true);
} else {
$table = new Doctrine_Table($name, $this);
$table = new Doctrine_Table($name, $this, true);
}
$this->tables[$name] = $table;
$this->tables[$name] = $table;
return $table;
}
......
......@@ -176,7 +176,7 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
* @param string $name the name of the component
* @param Doctrine_Connection $conn the connection associated with this table
*/
public function __construct($name, Doctrine_Connection $conn)
public function __construct($name, Doctrine_Connection $conn, $initDefinition = false)
{
$this->_conn = $conn;
......@@ -185,15 +185,17 @@ class Doctrine_Table extends Doctrine_Configurable implements Countable
$this->_options['name'] = $name;
$this->_parser = new Doctrine_Relation_Parser($this);
$record = $this->initDefinition($name);
$this->initIdentifier();
$record->setUp();
// if tree, set up tree
if ($this->isTree()) {
$this->getTree()->setUp();
if ($initDefinition) {
$record = $this->initDefinition($name);
$this->initIdentifier();
$record->setUp();
// if tree, set up tree
if ($this->isTree()) {
$this->getTree()->setUp();
}
}
$this->_filters[] = new Doctrine_Record_Filter_Standard();
$this->_repository = new Doctrine_Table_Repository($this);
......
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