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

typos and removed confusing ternary

Browse source
This commit is contained in:
Asmir Mustafic 2014-02-06 12:44:13 +01:00
parent 557686aa0a
commit 724e69146c
2 changed files with 7 additions and 5 deletions
lib/Doctrine/ORM/Persisters
ManyToManyPersister.php
tests/Doctrine/Tests/ORM/Functional
ExtraLazyCollectionTest.php

11
lib/Doctrine/ORM/Persisters/ManyToManyPersister.php
View file

@ -274,7 +274,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
$sql = 'SELECT 1 FROM ' . $quotedJoinTable . ' WHERE ' . implode(' AND ', $whereClauses);
return (bool) $this->conn->fetchColumn($sql, $params);
}
/**
* {@inheritdoc}
*/
@ -341,15 +341,16 @@ class ManyToManyPersister extends AbstractCollectionPersister
$filterMapping = $coll->getMapping();
$mapping = $filterMapping;
$indexBy = $mapping['indexBy'];
$wasOwning = $mapping['isOwningSide'];
$id = $uow->getEntityIdentifier($coll->getOwner());
$targetEntity = $this->em->getClassMetadata($mapping['targetEntity']);
if (! $mapping['isOwningSide']) {
$associationSourceClass = $this->em->getClassMetadata($mapping['targetEntity']);
$mapping = $associationSourceClass->associationMappings[$mapping['mappedBy']];
$mapping = $associationSourceClass->associationMappings[$mapping['mappedBy']];
$joinColumns = $mapping['joinTable']['joinColumns'];
} else {
$joinColumns = $mapping['joinTable']['inverseJoinColumns'];
$associationSourceClass = $this->em->getClassMetadata($mapping['sourceEntity']);
}
@ -361,7 +362,8 @@ class ManyToManyPersister extends AbstractCollectionPersister
if ($joinNeeded) { // extra join needed if indexBy is not a @id
$joinConditions = array();
foreach ($wasOwning?$mapping['joinTable']['inverseJoinColumns']:$mapping['joinTable']['joinColumns'] as $joinTableColumn) {
foreach ($joinColumns as $joinTableColumn) {
$joinConditions[] = 't.'.$joinTableColumn['name'].' = tr.'.$joinTableColumn['referencedColumnName'];
}
$tableName = $this->quoteStrategy->getTableName($targetEntity, $this->platform);
@ -397,6 +399,7 @@ class ManyToManyPersister extends AbstractCollectionPersister
return array($quotedJoinTable, $whereClauses, $params);
}
/**
* @param \Doctrine\ORM\PersistentCollection $coll
* @param object $element

1
tests/Doctrine/Tests/ORM/Functional/ExtraLazyCollectionTest.php
View file

@ -758,6 +758,5 @@ class ExtraLazyCollectionTest extends \Doctrine\Tests\OrmFunctionalTestCase
$this->topic = $article1->topic;
$this->phonenumber = $phonenumber1->phonenumber;
}
}