Commit 60f6020b authored by romanb's avatar romanb

[2.0] Intermediate commit.

parent 4d13925b
...@@ -35,7 +35,7 @@ use Doctrine\ORM\Mapping\ClassMetadata; ...@@ -35,7 +35,7 @@ use Doctrine\ORM\Mapping\ClassMetadata;
* @link www.doctrine-project.org * @link www.doctrine-project.org
* @since 2.0 * @since 2.0
*/ */
abstract class AbstractEntityPersister class AbstractEntityPersister
{ {
/** /**
* Metadata object that describes the mapping of the mapped entity class. * Metadata object that describes the mapping of the mapped entity class.
......
...@@ -1042,7 +1042,8 @@ class SqlWalker ...@@ -1042,7 +1042,8 @@ class SqlWalker
} }
if (isset($class->associationMappings[$fieldName])) { if (isset($class->associationMappings[$fieldName])) {
//FIXME: Composite key support, inverse side support //FIXME: Inverse side support
//FIXME: Throw exception on composite key
$sql .= $class->associationMappings[$fieldName]->joinColumns[0]['name']; $sql .= $class->associationMappings[$fieldName]->joinColumns[0]['name'];
} else { } else {
$sql .= $class->getColumnName($fieldName); $sql .= $class->getColumnName($fieldName);
......
...@@ -1476,7 +1476,7 @@ class UnitOfWork implements PropertyChangedListener ...@@ -1476,7 +1476,7 @@ class UnitOfWork implements PropertyChangedListener
if ( ! isset($this->_persisters[$entityName])) { if ( ! isset($this->_persisters[$entityName])) {
$class = $this->_em->getClassMetadata($entityName); $class = $this->_em->getClassMetadata($entityName);
if ($class->isInheritanceTypeNone()) { if ($class->isInheritanceTypeNone()) {
$persister = new Persisters\StandardEntityPersister($this->_em, $class); $persister = new Persisters\AbstractEntityPersister($this->_em, $class);
} else if ($class->isInheritanceTypeSingleTable()) { } else if ($class->isInheritanceTypeSingleTable()) {
$persister = new Persisters\SingleTablePersister($this->_em, $class); $persister = new Persisters\SingleTablePersister($this->_em, $class);
} else if ($class->isInheritanceTypeJoined()) { } else if ($class->isInheritanceTypeJoined()) {
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment