1
0
mirror of synced 2025-03-05 20:36:15 +03:00

Fixed #DDC-580

Conflicts:

	lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
This commit is contained in:
Roman S. Borschel 2010-05-11 00:03:09 +02:00
parent f619a15a63
commit f9b53c6b5c

View File

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