RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 06:21:40 +03:00
Code Issues Projects Releases Wiki Activity

Reverted change. actAs() and loadTemplate() currently only work in the setTableDefinition()

Browse Source
This commit is contained in:
Jonathan.Wage 2007-11-30 22:49:04 +00:00
parent deabfcbb54
commit e8bb04a66e
1 changed files with 9 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
lib/Doctrine/Import/Builder.php
View File

@ -325,7 +325,7 @@ END;
* @param string $table
* @param array $tableColumns
*/
public function buildTableDefinition(array $options, array $columns, array $relations, array $indexes, array $attributes, array $tableOptions)
public function buildTableDefinition(array $options, array $columns, array $relations, array $indexes, array $attributes, array $tableOptions, array $templates, array $actAs)
{
$ret = array();
@ -376,6 +376,13 @@ END;
$i++;
$ret[$i] = $this->buildTableOptions($tableOptions);
$i++;
$ret[$i] = $this->buildTemplates($templates);
$i++;
$ret[$i] = $this->buildActAs($actAs);
$i++;
$code = implode("\n", $ret);
$code = trim($code);
@ -585,12 +592,6 @@ END;
$ret[$i] = " ".'$this->setInheritanceMap(array(\''.$options['inheritance']['keyField'].'\' => \''.$options['inheritance']['keyValue'].'\'));';
}
$ret[$i] = $this->buildTemplates($templates);
$i++;
$ret[$i] = $this->buildActAs($actAs);
$i++;
$code = implode("\n", $ret);
$code = trim($code);
@ -622,7 +623,7 @@ END;
$extends = isset($options['inheritance']['extends']) ? $options['inheritance']['extends']:$this->_baseClassName;
if ( ! (isset($options['no_definition']) && $options['no_definition'] === true)) {
$definition = $this->buildTableDefinition($options, $columns, $relations, $indexes, $attributes, $tableOptions);
$definition = $this->buildTableDefinition($options, $columns, $relations, $indexes, $attributes, $tableOptions, $templates, $actAs);
$setUp = $this->buildSetUp($options, $columns, $relations, $templates, $actAs);
} else {
$definition = null;