Skip to content

Commit

Permalink
[Command] Removed the need to parse 'default.properties'
Browse files Browse the repository at this point in the history
  • Loading branch information
willdurand committed Dec 22, 2011
1 parent 9c79cde commit f866bf6
Showing 1 changed file with 1 addition and 4 deletions.
5 changes: 1 addition & 4 deletions src/Propel/Generator/Command/SqlBuild.php
Expand Up @@ -61,11 +61,8 @@ protected function execute(InputInterface $input, OutputInterface $output)
{ {
$manager = new SqlManager(); $manager = new SqlManager();


$buildProperties = realpath($input->getOption('input-dir') . DIRECTORY_SEPARATOR . 'build.properties'); $buildProperties = realpath($input->getOption('input-dir') . DIRECTORY_SEPARATOR . 'build.properties');
$defaultProperties = realpath(__DIR__.'/../../../../tools/generator/default.properties');

$generatorConfig = new GeneratorConfig(array_merge( $generatorConfig = new GeneratorConfig(array_merge(
$this->getBuildProperties($defaultProperties),
$this->getBuildProperties($buildProperties), $this->getBuildProperties($buildProperties),
array( array(
'propel.platform.class' => $input->getOption('platform'), 'propel.platform.class' => $input->getOption('platform'),
Expand Down

0 comments on commit f866bf6

Please sign in to comment.