RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-01-19 06:51:40 +03:00
Code Issues Projects Releases Wiki Activity

Merge branch 'hotfix/#1265-sti-persister-one-to-one-association-notices-fix' into hotfix/#1265-sti-persister-one-to-one-association-notices

Browse Source
This commit is contained in:
Marco Pivetta 2015-01-18 18:27:01 +01:00
commit 544add9e8b
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
lib/Doctrine/ORM/Persisters/Entity/SingleTablePersister.php
View File

@ -90,14 +90,14 @@ class SingleTablePersister extends AbstractEntityInheritancePersister
foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) { foreach ($assoc['targetToSourceKeyColumns'] as $srcColumn) {
$className = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name; $className = isset($assoc['inherited']) ? $assoc['inherited'] : $this->class->name;
$targetClass = $this->em->getClassMetadata($mapping['targetEntity']); $targetClass = $this->em->getClassMetadata($assoc['targetEntity']);
$columnList[] = $this->getSelectJoinColumnSQL( $columnList[] = $this->getSelectJoinColumnSQL(
$tableAlias, $tableAlias,
$srcColumn, $srcColumn,
$className, $className,
PersisterHelper::getTypeOfColumn( PersisterHelper::getTypeOfColumn(
$mapping['sourceToTargetKeyColumns'][$srcColumn], $assoc['sourceToTargetKeyColumns'][$srcColumn],
$targetClass, $targetClass,
$this->em $this->em
) )