RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-20 22:23:14 +03:00
Code Issues Projects Releases Wiki Activity

#881 DDC-2825 - renaming table/schema name for clarity and to avoid collisions

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-14 19:16:42 +01:00
parent 7b168de236
commit 7164e28138
9 changed files with 16 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
tests/Doctrine/Tests/Models/DDC2825/ExplicitSchemaAndTable.php
View File

@ -2,16 +2,11 @@
namespace Doctrine\Tests\Models\DDC2825;
/**
* @Entity
* @Table(name="mytable", schema="myschema")
*/
/** @Entity @Table(name="explicit_table", schema="explicit_schema") */
class ExplicitSchemaAndTable
{
const CLASSNAME = __CLASS__;
/**
* @Id @Column()
*/
/** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
public $id;
}

7
tests/Doctrine/Tests/Models/DDC2825/SchemaAndTableInTableName.php
View File

@ -6,15 +6,12 @@ namespace Doctrine\Tests\Models\DDC2825;
* Quoted column name to check that sequence names are
* correctly handled
*
* @Entity
* @Table(name="myschema.mytable")
* @Entity @Table(name="implicit_schema.implicit_table")
*/
class SchemaAndTableInTableName
{
const CLASSNAME = __CLASS__;
/**
* @Id @Column()
*/
/** @Id @Column(type="integer") @GeneratedValue(strategy="AUTO") */
public $id;
}

8
tests/Doctrine/Tests/ORM/Mapping/AbstractMappingDriverTest.php
View File

@ -944,8 +944,8 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
/* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
$metadata = $this->createClassMetadataFactory()->getMetadataFor(ExplicitSchemaAndTable::CLASSNAME);
$this->assertSame('myschema', $metadata->getSchemaName());
$this->assertSame('mytable', $metadata->getTableName());
$this->assertSame('explicit_schema', $metadata->getSchemaName());
$this->assertSame('explicit_table', $metadata->getTableName());
}
/**
@ -957,8 +957,8 @@ abstract class AbstractMappingDriverTest extends \Doctrine\Tests\OrmTestCase
/* @var $metadata \Doctrine\ORM\Mapping\ClassMetadata */
$metadata = $this->createClassMetadataFactory()->getMetadataFor(SchemaAndTableInTableName::CLASSNAME);
$this->assertSame('myschema', $metadata->getSchemaName());
$this->assertSame('mytable', $metadata->getTableName());
$this->assertSame('implicit_schema', $metadata->getSchemaName());
$this->assertSame('implicit_table', $metadata->getTableName());
}
}

4
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.php
View File

@ -5,8 +5,8 @@ use Doctrine\ORM\Mapping\ClassMetadata;
/* @var $metadata ClassMetadata */
$metadata->setPrimaryTable(array(
'name' => 'mytable',
'schema' => 'myschema',
'name' => 'explicit_table',
'schema' => 'explicit_schema',
));
$metadata->mapField(array(

2
tests/Doctrine/Tests/ORM/Mapping/php/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.php
View File

@ -5,7 +5,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
/* @var $metadata ClassMetadata */
$metadata->setPrimaryTable(array(
'name' => 'myschema.mytable',
'name' => 'implicit_schema.implicit_table',
));
$metadata->mapField(array(

2
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"
>
<entity name="Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable" table="mytable" schema="myschema">
<entity name="Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable" table="explicit_table" schema="explicit_schema">
<id name="id" column="id">
<generator strategy="AUTO"/>
</id>

2
tests/Doctrine/Tests/ORM/Mapping/xml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.xml
View File

@ -5,7 +5,7 @@
xsi:schemaLocation="http://doctrine-project.org/schemas/orm/doctrine-mapping
https://raw.github.com/doctrine/doctrine2/master/doctrine-mapping.xsd"
>
<entity name="Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName" table="myschema.mytable">
<entity name="Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName" table="implicit_schema.implicit_table">
<id name="id" column="id">
<generator strategy="AUTO"/>
</id>

4
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.ExplicitSchemaAndTable.dcm.yml
View File

@ -1,7 +1,7 @@
Doctrine\Tests\Models\DDC2825\ExplicitSchemaAndTable:
type: entity
table: mytable
schema: myschema
table: explicit_table
schema: explicit_schema
id:
id:
generator:

2
tests/Doctrine/Tests/ORM/Mapping/yaml/Doctrine.Tests.Models.DDC2825.SchemaAndTableInTableName.dcm.yml
View File

@ -1,6 +1,6 @@
Doctrine\Tests\Models\DDC2825\SchemaAndTableInTableName:
type: entity
table: myschema.mytable
table: implicit_schema.implicit_table
id:
id:
generator: