Skip to content

Commit

Permalink
Fixed #DDC-580
Browse files Browse the repository at this point in the history
  • Loading branch information
@Shurakai
Shurakai committed May 10, 2010
1 parent c2d2e45 commit b63afb6
Showing 1 changed file with 48 additions and 48 deletions.
96 changes: 48 additions & 48 deletions lib/Doctrine/ORM/Mapping/Driver/XmlDriver.php
View file
Expand Up @@ -65,11 +65,11 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
if (isset($xmlRoot['table'])) {
$metadata->table['name'] = (string)$xmlRoot['table'];
}

if (isset($xmlRoot['schema'])) {
$metadata->table['schema'] = (string)$xmlRoot['schema'];
}

if (isset($xmlRoot['inheritance-type'])) {
$inheritanceType = (string)$xmlRoot['inheritance-type'];
$metadata->setInheritanceType(constant('Doctrine\ORM\Mapping\ClassMetadata::INHERITANCE_TYPE_' . $inheritanceType));
Expand Down Expand Up @@ -108,13 +108,13 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
} else {
$columns = $index['columns'];
}

$metadata->table['indexes'][$index['name']] = array(
'columns' => $columns
);
}
}

// Evaluate <unique-constraints..>
if (isset($xmlRoot->{'unique-constraints'})) {
foreach ($xmlRoot->{'unique-constraints'}->{'unique-constraint'} as $unique) {
Expand All @@ -139,43 +139,43 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
'fieldName' => (string)$fieldMapping['name'],
'type' => (string)$fieldMapping['type']
);

if (isset($fieldMapping['column'])) {
$mapping['columnName'] = (string)$fieldMapping['column'];
}

if (isset($fieldMapping['length'])) {
$mapping['length'] = (int)$fieldMapping['length'];
}

if (isset($fieldMapping['precision'])) {
$mapping['precision'] = (int)$fieldMapping['precision'];
}

if (isset($fieldMapping['scale'])) {
$mapping['scale'] = (int)$fieldMapping['scale'];
}

if (isset($fieldMapping['unique'])) {
$mapping['unique'] = ((string)$fieldMapping['unique'] == "false") ? false : true;
}

if (isset($fieldMapping['options'])) {
$mapping['options'] = (array)$fieldMapping['options'];
}

if (isset($fieldMapping['nullable'])) {
$mapping['nullable'] = ((string)$fieldMapping['nullable'] == "false") ? false : true;
}

if (isset($fieldMapping['version']) && $fieldMapping['version']) {
$metadata->setVersionMapping($mapping);
}

if (isset($fieldMapping['column-definition'])) {
$mapping['columnDefinition'] = (string)$fieldMapping['column-definition'];
}

$metadata->mapField($mapping);
}
}
Expand All @@ -187,11 +187,11 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
'fieldName' => (string)$idElement['name'],
'type' => (string)$idElement['type']
);

if (isset($idElement['column'])) {
$mapping['columnName'] = (string)$idElement['column'];
}

$metadata->mapField($mapping);

if (isset($idElement->generator)) {
Expand Down Expand Up @@ -221,38 +221,38 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
'fieldName' => (string)$oneToOneElement['field'],
'targetEntity' => (string)$oneToOneElement['target-entity']
);

if (isset($oneToOneElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\AssociationMapping::FETCH_' . (string)$oneToOneElement['fetch']);
}

if (isset($oneToOneElement['mapped-by'])) {
$mapping['mappedBy'] = (string)$oneToOneElement['mapped-by'];
} else {
if (isset($oneToOneElement['inversed-by'])) {
$mapping['inversedBy'] = (string)$oneToOneElement['inversed-by'];
}
$joinColumns = array();

if (isset($oneToOneElement->{'join-column'})) {
$joinColumns[] = $this->_getJoinColumnMapping($oneToOneElement->{'join-column'});
} else if (isset($oneToOneElement->{'join-columns'})) {
foreach ($oneToOneElement->{'join-columns'}->{'join-column'} as $joinColumnElement) {
$joinColumns[] = $this->_getJoinColumnMapping($joinColumnElement);
}
}

$mapping['joinColumns'] = $joinColumns;
}

if (isset($oneToOneElement->cascade)) {
$mapping['cascade'] = $this->_getCascadeMappings($oneToOneElement->cascade);
}

if (isset($oneToOneElement->{'orphan-removal'})) {
$mapping['orphanRemoval'] = (bool)$oneToOneElement->{'orphan-removal'};
}

$metadata->mapOneToOne($mapping);
}
}
Expand All @@ -265,15 +265,15 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
'targetEntity' => (string)$oneToManyElement['target-entity'],
'mappedBy' => (string)$oneToManyElement['mapped-by']
);

if (isset($oneToManyElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\AssociationMapping::FETCH_' . (string)$oneToManyElement['fetch']);
}

if (isset($oneToManyElement->cascade)) {
$mapping['cascade'] = $this->_getCascadeMappings($oneToManyElement->cascade);
}

if (isset($oneToManyElement->{'orphan-removal'})) {
$mapping['orphanRemoval'] = (bool)$oneToManyElement->{'orphan-removal'};
}
Expand All @@ -285,19 +285,19 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
}
$mapping['orderBy'] = $orderBy;
}

$metadata->mapOneToMany($mapping);
}
}

// Evaluate <many-to-one ...> mappings
if (isset($xmlRoot->{'many-to-one'})) {
foreach ($xmlRoot->{'many-to-one'} as $manyToOneElement) {
$mapping = array(
'fieldName' => (string)$manyToOneElement['field'],
'targetEntity' => (string)$manyToOneElement['target-entity']
);

if (isset($manyToOneElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\AssociationMapping::FETCH_' . (string)$manyToOneElement['fetch']);
}
Expand All @@ -324,27 +324,27 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
if (isset($manyToOneElement->cascade)) {
$mapping['cascade'] = $this->_getCascadeMappings($manyToOneElement->cascade);
}

if (isset($manyToOneElement->{'orphan-removal'})) {
$mapping['orphanRemoval'] = (bool)$manyToOneElement->{'orphan-removal'};
}

$metadata->mapManyToOne($mapping);
}
}

// Evaluate <many-to-many ...> mappings
if (isset($xmlRoot->{'many-to-many'})) {
foreach ($xmlRoot->{'many-to-many'} as $manyToManyElement) {
$mapping = array(
'fieldName' => (string)$manyToManyElement['field'],
'targetEntity' => (string)$manyToManyElement['target-entity']
);

if (isset($manyToManyElement['fetch'])) {
$mapping['fetch'] = constant('Doctrine\ORM\Mapping\AssociationMapping::FETCH_' . (string)$manyToManyElement['fetch']);
}

if (isset($manyToManyElement['mapped-by'])) {
$mapping['mappedBy'] = (string)$manyToManyElement['mapped-by'];
} else if (isset($manyToManyElement->{'join-table'})) {
Expand All @@ -360,22 +360,22 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
if (isset($joinTableElement['schema'])) {
$joinTable['schema'] = (string)$joinTableElement['schema'];
}

foreach ($joinTableElement->{'join-columns'}->{'join-column'} as $joinColumnElement) {
$joinTable['joinColumns'][] = $this->_getJoinColumnMapping($joinColumnElement);
}

foreach ($joinTableElement->{'inverse-join-columns'}->{'join-column'} as $joinColumnElement) {
$joinTable['inverseJoinColumns'][] = $this->_getJoinColumnMapping($joinColumnElement);
}

$mapping['joinTable'] = $joinTable;
}

if (isset($manyToManyElement->cascade)) {
$mapping['cascade'] = $this->_getCascadeMappings($manyToManyElement->cascade);
}

if (isset($manyToManyElement->{'orphan-removal'})) {
$mapping['orphanRemoval'] = (bool)$manyToManyElement->{'orphan-removal'};
}
Expand All @@ -387,7 +387,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
}
$mapping['orderBy'] = $orderBy;
}

$metadata->mapManyToMany($mapping);
}
}
Expand All @@ -403,7 +403,7 @@ public function loadMetadataForClass($className, ClassMetadataInfo $metadata)
/**
* Constructs a joinColumn mapping array based on the information
* found in the given SimpleXMLElement.
*
*
* @param $joinColumnElement The XML element.
* @return array The mapping array.
*/
Expand All @@ -413,33 +413,33 @@ private function _getJoinColumnMapping(SimpleXMLElement $joinColumnElement)
'name' => (string)$joinColumnElement['name'],
'referencedColumnName' => (string)$joinColumnElement['referenced-column-name']
);

if (isset($joinColumnElement['unique'])) {
$joinColumn['unique'] = ((string)$joinColumnElement['unique'] == "false") ? false : true;
}

if (isset($joinColumnElement['nullable'])) {
$joinColumn['nullable'] = ((string)$joinColumnElement['nullable'] == "false") ? false : true;
}

if (isset($joinColumnElement['on-delete'])) {
$joinColumn['onDelete'] = (string)$joinColumnElement['on-delete'];
}

if (isset($joinColumnElement['on-update'])) {
$joinColumn['onUpdate'] = (string)$joinColumnElement['on-update'];
}

if (isset($joinColumnElement['column-definition'])) {
$joinColumn['columnDefinition'] = (string)$joinColumnElement['column-definition'];
}

return $joinColumn;
}

/**
* Gathers a list of cascade options found in the given cascade element.
*
*
* @param $cascadeElement The cascade element.
* @return array The list of cascade options.
*/
Expand All @@ -456,7 +456,7 @@ private function _getCascadeMappings($cascadeElement)
}
return $cascades;
}

/**
* {@inheritdoc}
*/
Expand All @@ -471,7 +471,7 @@ protected function _loadMappingFile($file)
$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;
}
Expand Down

0 comments on commit b63afb6

Please sign in to comment.