deblan/propel-bundle
1
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge pull request #276 from boekkooi/patch-1

Browse source 
Fix possible `PDO Unknown database` error
This commit is contained in:
Toni Uebernickel 2014-11-01 14:46:11 +01:00
parent 1e667f256f b61fed529a
commit 68793ac525
2 changed files with 83 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
Command/DatabaseCreateCommand.php
View file

@ -77,12 +77,12 @@ class DatabaseCreateCommand extends AbstractCommand
* @param array $config A Propel connection configuration.
* @return array
*/
private function getTemporaryConfiguration($name, $config)
protected function getTemporaryConfiguration($name, $config)
{
$dbName = $this->parseDbName($config['connection']['dsn']);
$config['connection']['dsn'] = preg_replace(
'#dbname='.$dbName.';#',
'#dbname='.$dbName.'(;|$)#',
'',
$config['connection']['dsn']
);

81
Tests/Command/DatabaseCreateCommandTest.php Normal file
View file

@ -0,0 +1,81 @@
<?php
/**
* This file is part of the PropelBundle package.
* For the full copyright and license information, please view the LICENSE
* file that was distributed with this source code.
*
* @license MIT License
*/
namespace Propel\PropelBundle\Tests\Command;
use Propel\PropelBundle\Tests\TestCase;
use Propel\PropelBundle\Command\DatabaseCreateCommand;
/**
* @author Warnar Boekkooi <warnar@boekkooi.net>
*/
class DatabaseCreateCommandTest extends TestCase
{
/** @var TestableDatabaseCreateCommand */
protected $command;
public function setUp()
{
$this->command = new TestableDatabaseCreateCommand();
}
public function tearDown()
{
$this->command = null;
}
/**
* @dataProvider dataTemporaryConfiguration
*/
public function testTemporaryConfiguration($name, $config, $expectedDsn)
{
$datasource = $this->command->getTemporaryConfiguration($name, $config);
$this->assertArrayHasKey('datasources', $datasource);
$this->assertArrayHasKey($name, $datasource['datasources']);
$this->assertArrayHasKey('connection', $datasource['datasources'][$name]);
$this->assertArrayHasKey('dsn', $datasource['datasources'][$name]['connection']);
$this->assertEquals($expectedDsn, $datasource['datasources'][$name]['connection']['dsn']);
}
public function dataTemporaryConfiguration()
{
return array(
array(
'dbname',
array('connection' => array('dsn' => 'mydsn:host=localhost;dbname=test_db;')),
'mydsn:host=localhost;'
),
array(
'dbname_first',
array('connection' => array('dsn' => 'mydsn:dbname=test_db;host=localhost')),
'mydsn:host=localhost'
),
array(
'dbname_no_semicolon',
array('connection' => array('dsn' => 'mydsn:host=localhost;dbname=test_db')),
'mydsn:host=localhost;'
),
array(
'no_dbname',
array('connection' => array('dsn' => 'mydsn:host=localhost;')),
'mydsn:host=localhost;'
),
);
}
}
class TestableDatabaseCreateCommand extends DatabaseCreateCommand
{
public function getTemporaryConfiguration($name, $config)
{
return parent::getTemporaryConfiguration($name, $config);
}
}