RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-21 15:33:51 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1262-restore-run-dql-command-functionality'

Browse Source 
Close #1262
This commit is contained in:
Marco Pivetta 2015-01-17 21:31:11 +01:00
commit b23a8dd429
2 changed files with 94 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/Doctrine/ORM/Tools/Console/Command/RunDqlCommand.php
View File

@ -81,6 +81,7 @@ EOT
*/ */
protected function execute(InputInterface $input, OutputInterface $output) protected function execute(InputInterface $input, OutputInterface $output)
{ {
/* @var $em \Doctrine\ORM\EntityManagerInterface */
$em = $this->getHelper('em')->getEntityManager(); $em = $this->getHelper('em')->getEntityManager();
if (($dql = $input->getArgument('dql')) === null) { if (($dql = $input->getArgument('dql')) === null) {
@ -120,13 +121,13 @@ EOT
$query->setMaxResults((int) $maxResult); $query->setMaxResults((int) $maxResult);
} }
if ($input->hasOption('show-sql')) { if ($input->getOption('show-sql')) {
Debug::dump($query->getSQL()); $output->writeln(Debug::dump($query->getSQL(), 2, true, false));
return; return;
} }
$resultSet = $query->execute(array(), constant($hydrationMode)); $resultSet = $query->execute(array(), constant($hydrationMode));
Debug::dump($resultSet, $input->getOption('depth')); $output->writeln(Debug::dump($resultSet, $input->getOption('depth'), true, false));
} }
} }

90
tests/Doctrine/Tests/ORM/Tools/Console/Command/RunDqlCommandTest.php Normal file
View File

@ -0,0 +1,90 @@
<?php
namespace Doctrine\Tests\ORM\Tools\Console\Command;
use Doctrine\ORM\Tools\Console\Command\RunDqlCommand;
use Doctrine\ORM\Tools\Console\Helper\EntityManagerHelper;
use Doctrine\Tests\Models\Generic\DateTimeModel;
use Doctrine\Tests\OrmFunctionalTestCase;
use Symfony\Component\Console\Application;
use Symfony\Component\Console\Helper\HelperSet;
use Symfony\Component\Console\Tester\CommandTester;
/**
* Tests for {@see \Doctrine\ORM\Tools\Console\Command\RunDqlCommand}
*
* @covers \Doctrine\ORM\Tools\Console\Command\RunDqlCommand
*/
class RunDqlCommandTest extends OrmFunctionalTestCase
{
/**
* @var Application
*/
private $application;
/**
* @var RunDqlCommand
*/
private $command;
/**
* @var CommandTester
*/
private $tester;
protected function setUp()
{
$this->useModelSet('generic');
parent::setUp();
$this->application = new Application();
$this->command = new RunDqlCommand();
$this->application->setHelperSet(new HelperSet(array(
'em' => new EntityManagerHelper($this->_em)
)));
$this->application->add($this->command);
$this->tester = new CommandTester($this->command);
}
public function testCommandName()
{
$this->assertSame($this->command, $this->application->get('orm:run-dql'));
}
public function testWillRunQuery()
{
$this->_em->persist(new DateTimeModel());
$this->_em->flush();
$this->assertSame(
0,
$this->tester->execute(array(
'command' => $this->command->getName(),
'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e',
))
);
$this->assertContains(DateTimeModel::CLASSNAME, $this->tester->getDisplay());
}
public function testWillShowQuery()
{
$this->_em->persist(new DateTimeModel());
$this->_em->flush();
$this->assertSame(
0,
$this->tester->execute(array(
'command' => $this->command->getName(),
'dql' => 'SELECT e FROM ' . DateTimeModel::CLASSNAME . ' e',
'--show-sql' => 'true'
))
);
$this->assertStringMatchesFormat('string \'SELECT %a', $this->tester->getDisplay());
}
}