Commit 434228a5 authored by Benjamin Eberlei's avatar Benjamin Eberlei

Merge branch 'DBAL-219' into 2.2

parents 450a2a37 c42995f1
...@@ -155,6 +155,9 @@ class Schema extends AbstractAsset ...@@ -155,6 +155,9 @@ class Schema extends AbstractAsset
*/ */
private function getFullQualifiedAssetName($name) private function getFullQualifiedAssetName($name)
{ {
if ($this->isQuoted($name)) {
$name = $this->trimQuotes($name);
}
if (strpos($name, ".") === false) { if (strpos($name, ".") === false) {
$name = $this->getName() . "." . $name; $name = $this->getName() . "." . $name;
} }
......
...@@ -208,4 +208,17 @@ class SchemaTest extends \PHPUnit_Framework_TestCase ...@@ -208,4 +208,17 @@ class SchemaTest extends \PHPUnit_Framework_TestCase
$fk = current($fk); $fk = current($fk);
$this->assertSame($schemaNew->getTable('bar'), $this->readAttribute($fk, '_localTable')); $this->assertSame($schemaNew->getTable('bar'), $this->readAttribute($fk, '_localTable'));
} }
/**
* @group DBAL-219
*/
public function testHasTableForQuotedAsset()
{
$schema = new Schema();
$tableA = $schema->createTable('foo');
$tableA->addColumn('id', 'integer');
$this->assertTrue($schema->hasTable('`foo`'));
}
} }
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