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

some consistency fixes

Browse Source
This commit is contained in:
Johannes M. Schmitt 2013-11-01 22:37:59 +01:00
parent f86abd81dd
commit 97836ef8c6
4 changed files with 5 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/Doctrine/ORM/Mapping/ClassMetadataInfo.php
View File

@ -3094,7 +3094,7 @@ class ClassMetadataInfo implements ClassMetadata
$fieldMapping['declaredField'] = $property; $fieldMapping['declaredField'] = $property;
$fieldMapping['originalField'] = $fieldMapping['fieldName']; $fieldMapping['originalField'] = $fieldMapping['fieldName'];
$fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName']; $fieldMapping['fieldName'] = $property . "." . $fieldMapping['fieldName'];
$fieldMapping['columnName'] = $this->namingStrategy->embeddedFieldToColumnName($property, $fieldMapping['columnName']); $fieldMapping['columnName'] = $this->namingStrategy->embeddedFieldToColumnName($property, $fieldMapping['columnName'], $this->reflClass->name, $embeddable->reflClass->name);
$this->mapField($fieldMapping); $this->mapField($fieldMapping);
} }

4
lib/Doctrine/ORM/Mapping/DefaultNamingStrategy.php
View File

@ -53,9 +53,9 @@ class DefaultNamingStrategy implements NamingStrategy
/** /**
* {@inheritdoc} * {@inheritdoc}
*/ */
public function embeddedFieldToColumnName($propertyName, $embeddedColumnName) public function embeddedFieldToColumnName($propertyName, $embeddedColumnName, $className = null, $embeddedClassName = null)
{ {
return $propertyName.ucfirst($embeddedColumnName); return $propertyName.'_'.$embeddedColumnName;
} }
/** /**

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

@ -57,7 +57,7 @@ interface NamingStrategy
* *
* @return string * @return string
*/ */
function embeddedFieldToColumnName($propertyName, $embeddedColumnName); function embeddedFieldToColumnName($propertyName, $embeddedColumnName, $className = null, $embeddedClassName = null);
/** /**
* Returns the default reference column name. * Returns the default reference column name.

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

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