Commit 38331335 authored by Jonathan.Wage's avatar Jonathan.Wage

Fixes to indexes and to not call parent::setUp() in the base classes.

parent 34af8e3a
......@@ -268,6 +268,7 @@ END;
return "\n\tpublic function setTableDefinition()"."\n\t{\n".implode("\n", $ret)."\n\t}";
}
}
public function buildSetUp(array $options, array $columns, array $relations)
{
$ret = array();
......@@ -413,6 +414,7 @@ END;
$options['className'] = 'Base' . $options['className'];
$options['abstract'] = true;
$options['fileName'] = $generatedPath . DIRECTORY_SEPARATOR . $options['className'] . $this->suffix;
$options['override_parent'] = true;
$this->writeDefinition($options, $columns, $relations, $indexes);
} else {
......@@ -434,6 +436,7 @@ END;
$code .= "require_once('".$require."');";
}
}
$code .= PHP_EOL . $content;
$bytes = file_put_contents($options['fileName'], $code);
......
......@@ -119,8 +119,9 @@ class Doctrine_Import_Schema
$options = $this->getOptions($properties, $directory);
$columns = $this->getColumns($properties);
$relations = $this->getRelations($properties);
$indexes = $this->getIndexes($properties);
$builder->buildRecord($options, $columns, $relations);
$builder->buildRecord($options, $columns, $relations, $indexes);
}
}
......
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