RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-03 13:23:37 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'DDC-1224'

Browse source
This commit is contained in:
Benjamin Eberlei 2011-06-26 10:11:11 +02:00
commit ca0bea1d8a
2 changed files with 13 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View file

@ -1271,7 +1271,8 @@ class ClassMetadataInfo implements ClassMetadata
*/ */
public function getTemporaryIdTableName() public function getTemporaryIdTableName()
{ {
return $this->table['name'] . '_id_tmp'; // replace dots with underscores because PostgreSQL creates temporary tables in a special schema
return str_replace('.', '_', $this->table['name'] . '_id_tmp');
} }
/** /**

11
tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
View file

@ -236,6 +236,17 @@ class ClassMetadataTest extends \Doctrine\Tests\OrmTestCase
$this->setExpectedException('Doctrine\ORM\Mapping\MappingException'); $this->setExpectedException('Doctrine\ORM\Mapping\MappingException');
$cm->mapField(array('fieldName' => 'name', 'columnName' => 'name')); $cm->mapField(array('fieldName' => 'name', 'columnName' => 'name'));
} }
/**
* @group DDC-1224
*/
public function testGetTemporaryTableNameSchema()
{
$cm = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsUser');
$cm->setTableName('foo.bar');
$this->assertEquals('foo_bar_id_tmp', $cm->getTemporaryIdTableName());
}
public function testDefaultTableName() public function testDefaultTableName()
{ {