RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-04-01 12:26:11 +03:00
Code Issues Projects Releases Wiki Activity

Include className in calls to NamingStrategy joinColumnName method.

Browse source
This commit is contained in:
Jack Sleight 2015-01-14 16:32:23 +00:00 • committed by Marco Pivetta
parent 4cde35dc18
commit 82163a3301
5 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
docs/en/reference/namingstrategy.rst
View file

@ -78,7 +78,7 @@ a "naming standard" for database tables and columns.
* @param string $propertyName A property
* @return string A join column name
*/
function joinColumnName($propertyName);
function joinColumnName($propertyName, $className = null);
/**
* Return a join table name
@ -124,7 +124,7 @@ You need to implements NamingStrategy first. Following is an example
{
return 'id';
}
public function joinColumnName($propertyName)
public function joinColumnName($propertyName, $className = null)
{
return $propertyName . '_' . $this->referenceColumnName();
}

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

@ -1553,7 +1553,7 @@ class ClassMetadataInfo implements ClassMetadata
if ( ! isset($mapping['joinColumns']) || ! $mapping['joinColumns']) {
// Apply default join column
$mapping['joinColumns'] = array(array(
'name' => $this->namingStrategy->joinColumnName($mapping['fieldName']),
'name' => $this->namingStrategy->joinColumnName($mapping['fieldName'], $this->name),
'referencedColumnName' => $this->namingStrategy->referenceColumnName()
));
}
@ -1571,7 +1571,7 @@ class ClassMetadataInfo implements ClassMetadata
}
if (empty($joinColumn['name'])) {
$joinColumn['name'] = $this->namingStrategy->joinColumnName($mapping['fieldName']);
$joinColumn['name'] = $this->namingStrategy->joinColumnName($mapping['fieldName'], $this->name);
}
if (empty($joinColumn['referencedColumnName'])) {

2
lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
View file

@ -69,7 +69,7 @@ class DefaultNamingStrategy implements NamingStrategy
/**
* {@inheritdoc}
*/
public function joinColumnName($propertyName)
public function joinColumnName($propertyName, $className = null)
{
return $propertyName . '_' . $this->referenceColumnName();
}

2
lib/Doctrine/ORM/Mapping/NamingStrategy.php
View file

@ -73,7 +73,7 @@ interface NamingStrategy
*
* @return string A join column name.
*/
function joinColumnName($propertyName);
function joinColumnName($propertyName, $className = null);
/**
* Returns a join table name.

2
lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
View file

@ -106,7 +106,7 @@ class UnderscoreNamingStrategy implements NamingStrategy
/**
* {@inheritdoc}
*/
public function joinColumnName($propertyName)
public function joinColumnName($propertyName, $className = null)
{
return $this->underscore($propertyName) . '_' . $this->referenceColumnName();
}