Commit ead84035 authored by zYne's avatar zYne

--no commit message

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