diff -r b403086580f7 -r 0e57c730bb18 Command/UpdateSchemaDoctrineCommand.php --- a/Command/UpdateSchemaDoctrineCommand.php Fri Nov 18 17:54:30 2011 +0100 +++ b/Command/UpdateSchemaDoctrineCommand.php Fri Nov 25 18:55:42 2011 +0100 @@ -21,6 +21,7 @@ use Doctrine\ORM\Tools\Console\Command\SchemaTool\UpdateCommand; use Doctrine\ORM\Tools\SchemaTool; use Symfony\Bundle\DoctrineBundle\Command\Proxy\DoctrineCommandHelper; +use IRI\Bundle\WikiTagBundle\Utils\FilteredSchemaTool; /** @@ -90,64 +91,13 @@ $this->container = $container; } - - protected function filterUpdateSchema($sqls) - { - - // get service - $schema_utils = $this->getContainer()->get("wikitag.shema_utils"); - - $res_sqls = $schema_utils->filter_foreign_key($sqls); - $res_sqls = $schema_utils->filter_index_creation($res_sqls); - - - return $res_sqls; - } - + protected function executeSchemaCommand(InputInterface $input, OutputInterface $output, SchemaTool $schemaTool, array $metadatas) { - // Defining if update is complete or not (--complete not defined means $saveMode = true) - $saveMode = ($input->getOption('complete') !== true); - - $sqls = $schemaTool->getUpdateSchemaSql($metadatas, $saveMode); - $sqls = $this->filterUpdateSchema($sqls); - if (0 == count($sqls)) { - $output->writeln('Nothing to update - your database is already in sync with the current entity metadata.'); - - return; - } - - $dumpSql = (true === $input->getOption('dump-sql')); - $force = (true === $input->getOption('force')); - if ($dumpSql && $force) { - throw new \InvalidArgumentException('You can pass either the --dump-sql or the --force option (but not both simultaneously).'); - } - - if ($dumpSql) { - $output->writeln(implode(';' . PHP_EOL, $sqls)); - } else if ($force) { - $output->writeln('Updating database schema...'); - - $emHelper = $this->getHelper('em'); - - $conn = $emHelper->getEntityManager()->getConnection(); - - foreach ($sqls as $sql) { - $conn->executeQuery($sql); - } - $output->writeln(sprintf('Database schema updated successfully! "%s" queries were executed', count($sqls))); - } else { - $output->writeln('ATTENTION: This operation should not be executed in a production environment.'); - $output->writeln(' Use the incremental update to detect changes during development and use'); - $output->writeln(' the SQL DDL provided to manually update your database in production.'); - $output->writeln(''); - - $output->writeln(sprintf('The Schema-Tool would execute "%s" queries to update the database.', count($sqls))); - $output->writeln('Please run the operation by passing one of the following options:'); - - $output->writeln(sprintf(' %s --force to execute the command', $this->getName())); - $output->writeln(sprintf(' %s --dump-sql to dump the SQL statements to the screen', $this->getName())); - } + $filteredSchemaTool = new FilteredSchemaTool($this->getHelper("em")->getEntityManager(), $this->getContainer()); + + return parent::executeSchemaCommand($input, $output, $filteredSchemaTool, $metadatas); + }