Commit f9b53c6b authored by Roman S. Borschel's avatar Roman S. Borschel

Fixed #DDC-580

Conflicts:

	lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
parent f619a15a
......@@ -66,6 +66,7 @@ class XmlDriver extends AbstractFileDriver
if (isset($xmlRoot['table'])) {
$table['name'] = (string)$xmlRoot['table'];
}
$metadata->setPrimaryTable($table);
/* not implemented specially anyway. use table = schema.table
......@@ -474,7 +475,7 @@ class XmlDriver extends AbstractFileDriver
$result[$entityName] = $entityElement;
}
} else if (isset($xmlElement->{'mapped-superclass'})) {
foreach ($xmlElement->{'mapped-superclass'} as $mapperSuperClass) {
foreach ($xmlElement->{'mapped-superclass'} as $mappedSuperClass) {
$className = (string)$mappedSuperClass['name'];
$result[$className] = $mappedSuperClass;
}
......
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