RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-18 22:41:43 +03:00
Code Issues Projects Releases Wiki Activity

[2.0][DDC-57] Fixed.

Browse Source
This commit is contained in:
romanb 2009-10-26 13:05:32 +00:00
parent 4918d3e174
commit ac4b4889a6
4 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -163,7 +163,7 @@ class ManyToManyMapping extends AssociationMapping
if ($this->isOwningSide) {
foreach ($this->sourceToRelationKeyColumns as $sourceKeyColumn => $relationKeyColumn) {
// getting id
if (isset($sourceClass->reflFields[$sourceKeyColumn])) {
if (isset($sourceClass->fieldNames[$sourceKeyColumn])) {
$joinTableConditions[$relationKeyColumn] = $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
} else {
$joinTableConditions[$relationKeyColumn] = $joinColumnValues[$sourceKeyColumn];
@ -174,7 +174,7 @@ class ManyToManyMapping extends AssociationMapping
// TRICKY: since the association is inverted source and target are flipped
foreach ($owningAssoc->targetToRelationKeyColumns as $sourceKeyColumn => $relationKeyColumn) {
// getting id
if (isset($sourceClass->reflFields[$sourceKeyColumn])) {
if (isset($sourceClass->fieldNames[$sourceKeyColumn])) {
$joinTableConditions[$relationKeyColumn] = $sourceClass->reflFields[$sourceClass->fieldNames[$sourceKeyColumn]]->getValue($sourceEntity);
} else {
$joinTableConditions[$relationKeyColumn] = $joinColumnValues[$sourceKeyColumn];

4
lib/Doctrine/ORM/Persisters/StandardEntityPersister.php
View File

@ -576,9 +576,11 @@ class StandardEntityPersister
protected function _getSelectManyToManyEntityCollectionSql($manyToMany, array &$criteria)
{
$columnList = '';
$tableName = $this->_class->getQuotedTableName($this->_platform);
foreach ($this->_class->fieldNames as $field) {
if ($columnList != '') $columnList .= ', ';
$columnList .= $this->_class->getQuotedColumnName($field, $this->_platform);
$columnList .= $tableName . '.' . $this->_class->getQuotedColumnName($field, $this->_platform);
}
foreach ($this->_class->associationMappings as $assoc) {

3
tests/Doctrine/Tests/Models/ECommerce/ECommerceCategory.php
View File

@ -15,8 +15,7 @@ use Doctrine\Common\Collections\ArrayCollection;
class ECommerceCategory
{
/**
* @Column(type="integer")
* @Id
* @Id @Column(type="integer")
* @GeneratedValue(strategy="AUTO")
*/
private $id;

4
tests/Doctrine/Tests/Models/ECommerce/ECommerceProduct.php
View File

@ -40,8 +40,8 @@ class ECommerceProduct
/**
* @ManyToMany(targetEntity="ECommerceCategory", cascade={"persist"})
* @JoinTable(name="ecommerce_products_categories",
joinColumns={@JoinColumn(name="product_id", referencedColumnName="id")},
inverseJoinColumns={@JoinColumn(name="category_id", referencedColumnName="id")})
* joinColumns={@JoinColumn(name="product_id", referencedColumnName="id")},
* inverseJoinColumns={@JoinColumn(name="category_id", referencedColumnName="id")})
*/
private $categories;