RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-03-04 20:03:21 +03:00
Code Issues Projects Releases Wiki Activity

DDC-832 - Fix regression introduced with last commit.

Browse Source
This commit is contained in:
Benjamin Eberlei 2010-10-30 19:54:36 +02:00
parent 3936f179e9
commit 97eeb437b2
2 changed files with 3 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
lib/Doctrine/ORM/Persisters/BasicEntityPersister.php
View File

@ -392,16 +392,6 @@ class BasicEntityPersister
$this->_conn->delete($this->_class->getQuotedTableName($this->_platform), $id); $this->_conn->delete($this->_class->getQuotedTableName($this->_platform), $id);
} }
/**
* Gets the ClassMetadata instance of the entity class this persister is used for.
*
* @return Doctrine\ORM\Mapping\ClassMetadata
*/
public function getClassMetadata()
{
return $this->_class;
}
/** /**
* Prepares the changeset of an entity for database insertion (UPDATE). * Prepares the changeset of an entity for database insertion (UPDATE).
* *

5
lib/Doctrine/ORM/Persisters/JoinedSubclassPersister.php
View File

@ -193,7 +193,8 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
$updateData = $this->_prepareUpdateData($entity); $updateData = $this->_prepareUpdateData($entity);
if ($isVersioned = $this->_class->isVersioned) { if ($isVersioned = $this->_class->isVersioned) {
$versionedTable = $this->_getVersionedClassMetadata()->table['name']; $versionedClass = $this->_getVersionedClassMetadata();
$versionedTable = $versionedClass->table['name'];
} }
if ($updateData) { if ($updateData) {
@ -203,7 +204,7 @@ class JoinedSubclassPersister extends AbstractEntityInheritancePersister
// Make sure the table with the version column is updated even if no columns on that // Make sure the table with the version column is updated even if no columns on that
// table were affected. // table were affected.
if ($isVersioned && ! isset($updateData[$versionedTable])) { if ($isVersioned && ! isset($updateData[$versionedTable])) {
$this->_updateTable($entity, $this->_quotedTableMap[$versionedTable], array(), true); $this->_updateTable($entity, $versionedClass->getQuotedTableName($this->_platform), array(), true);
} }
} }
} }