Skip to content

Commit

Permalink
Merge pull request doctrine#391 from FabioBatSilva/ns-class
Browse files Browse the repository at this point in the history
Give FQCN to NamingStrategy#propertyToColumnName
guilhermeblanco committed Aug 12, 2012
2 parents 72ce9a7 + 1369e3d commit f8a582d
Showing 5 changed files with 37 additions and 4 deletions.
3 changes: 2 additions & 1 deletion lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
Original file line number Diff line number Diff line change
@@ -1188,7 +1188,7 @@ protected function _validateAndCompleteFieldMapping(array &$mapping)

// Complete fieldName and columnName mapping
if ( ! isset($mapping['columnName'])) {
$mapping['columnName'] = $this->namingStrategy->propertyToColumnName($mapping['fieldName']);
$mapping['columnName'] = $this->namingStrategy->propertyToColumnName($mapping['fieldName'], $this->name);
}

if ($mapping['columnName'][0] === '`') {
@@ -1465,6 +1465,7 @@ protected function _validateAndCompleteManyToManyMapping(array $mapping)
if ( ! isset($mapping['joinTable']['name'])) {
$mapping['joinTable']['name'] = $this->namingStrategy->joinTableName($mapping['sourceEntity'], $mapping['targetEntity'], $mapping['fieldName']);
}

if ( ! isset($mapping['joinTable']['joinColumns'])) {
$mapping['joinTable']['joinColumns'] = array(array(
'name' => $this->namingStrategy->joinKeyColumnName($mapping['sourceEntity']),
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
Original file line number Diff line number Diff line change
@@ -45,7 +45,7 @@ public function classToTableName($className)
/**
* {@inheritdoc}
*/
public function propertyToColumnName($propertyName)
public function propertyToColumnName($propertyName, $className = null)
{
return $propertyName;
}
3 changes: 2 additions & 1 deletion lib/Doctrine/ORM/Mapping/NamingStrategy.php
Original file line number Diff line number Diff line change
@@ -42,9 +42,10 @@ function classToTableName($className);
* Return a column name for a property
*
* @param string $propertyName A property
* @param string $className The fully-qualified class name
* @return string A column name
*/
function propertyToColumnName($propertyName);
function propertyToColumnName($propertyName, $className = null);

/**
* Return the default reference column name
2 changes: 1 addition & 1 deletion lib/Doctrine/ORM/Mapping/UnderscoreNamingStrategy.php
Original file line number Diff line number Diff line change
@@ -80,7 +80,7 @@ public function classToTableName($className)
/**
* {@inheritdoc}
*/
public function propertyToColumnName($propertyName)
public function propertyToColumnName($propertyName, $className = null)
{
return $this->underscore($propertyName);
}
31 changes: 31 additions & 0 deletions tests/Doctrine/Tests/ORM/Mapping/ClassMetadataTest.php
Original file line number Diff line number Diff line change
@@ -922,6 +922,26 @@ public function testFullyQualifiedClassNameShouldBeGivenToNamingStrategy()
$this->assertEquals('doctrineglobal_article_cms_cmsuser', $articleMetadata->associationMappings['author']['joinTable']['name']);
}

/**
* @group DDC-984
* @group DDC-559
*/
public function testFullyQualifiedClassNameShouldBeGivenToNamingStrategyPropertyToColumnName()
{
$namingStrategy = new MyPrefixNamingStrategy();
$metadata = new ClassMetadata('Doctrine\Tests\Models\CMS\CmsAddress', $namingStrategy);

$metadata->initializeReflection(new \Doctrine\Common\Persistence\Mapping\RuntimeReflectionService);

$metadata->mapField(array('fieldName'=>'country'));
$metadata->mapField(array('fieldName'=>'city'));

$this->assertEquals($metadata->fieldNames, array(
'cmsaddress_country' => 'country',
'cmsaddress_city' => 'city'
));
}

/**
* @group DDC-1746
*/
@@ -993,3 +1013,14 @@ public function classToTableName($className)
return strtolower($className);
}
}

class MyPrefixNamingStrategy extends \Doctrine\ORM\Mapping\DefaultNamingStrategy
{
/**
* {@inheritdoc}
*/
public function propertyToColumnName($propertyName, $className = null)
{
return strtolower($this->classToTableName($className)) . '_' . $propertyName;
}
}

0 comments on commit f8a582d

Please sign in to comment.