Permalink
Browse files

Merge branch 'DDC-1360'

  • Loading branch information...
2 parents e5cf1da + 9d398af commit 959a68694e5827a74ad5b8c8216996ffff6196ba @beberlei beberlei committed Dec 28, 2011
View
2 lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
@@ -1376,7 +1376,7 @@ public function setPrimaryTable(array $table)
{
if (isset($table['name'])) {
if ($table['name'][0] == '`') {
- $this->table['name'] = trim($table['name'], '`');
+ $this->table['name'] = str_replace("`", "", $table['name']);
$this->table['quoted'] = true;
} else {
$this->table['name'] = $table['name'];
View
37 tests/Doctrine/Tests/ORM/Functional/Ticket/DDC1360Test.php
@@ -0,0 +1,37 @@
+<?php
+
+namespace Doctrine\Tests\ORM\Functional\Ticket;
+
+use Doctrine\Tests\OrmFunctionalTestCase;
+
+/**
+ * @group DDC-1360
+ */
+class DDC1360Test extends OrmFunctionalTestCase
+{
+ public function testSchemaDoubleQuotedCreate()
+ {
+ if ($this->_em->getConnection()->getDatabasePlatform()->getName() != "postgresql") {
+ $this->markTestSkipped("PostgreSQL only test.");
+ }
+
+ $sql = $this->_schemaTool->getCreateSchemaSQL(array(
+ $this->_em->getClassMetadata(__NAMESPACE__ . '\DDC1360DoubleQuote')
+ ));
+
+ $this->assertEquals(array(
+ 'CREATE TABLE "user"."user" (id INT NOT NULL, PRIMARY KEY(id))',
+ 'CREATE SEQUENCE "user".user_id_seq INCREMENT BY 1 MINVALUE 1 START 1',
+ ), $sql);
+ }
+}
+
+/**
+ * @Entity @Table(name="`user`.`user`")
+ */
+class DDC1360DoubleQuote
+{
+ /** @Id @GeneratedValue @Column(type="integer") */
+ public $id;
+}
+

0 comments on commit 959a686

Please sign in to comment.