RetailCRM-Mirror/doctrine2
1
0
Fork 0
mirror of synced 2025-02-22 15:13:13 +03:00
Code Issues Projects Releases Wiki Activity

Merge commit 'upstream/master'

Browse Source
This commit is contained in:
Roman S. Borschel 2010-05-14 22:11:47 +02:00
commit 3b01277fd4
2 changed files with 2 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
lib/Doctrine/ORM/Mapping/Driver/DatabaseDriver.php
View File

@ -78,13 +78,6 @@ class DatabaseDriver implements Driver
$ids = array(); $ids = array();
$fieldMappings = array(); $fieldMappings = array();
foreach ($columns as $column) { foreach ($columns as $column) {
// Skip columns that are foreign keys
foreach ($foreignKeys as $foreignKey) {
if (in_array(strtolower($column->getName()), array_map('strtolower', $foreignKey->getColumns()))) {
continue(2);
}
}
$fieldMapping = array(); $fieldMapping = array();
if (isset($indexes['primary']) && in_array($column->getName(), $indexes['primary']->getColumns())) { if (isset($indexes['primary']) && in_array($column->getName(), $indexes['primary']->getColumns())) {
$fieldMapping['id'] = true; $fieldMapping['id'] = true;
@ -100,7 +93,7 @@ class DatabaseDriver implements Driver
} else if ($column->getType() instanceof \Doctrine\DBAL\Types\IntegerType) { } else if ($column->getType() instanceof \Doctrine\DBAL\Types\IntegerType) {
$fieldMapping['unsigned'] = $column->getUnsigned(); $fieldMapping['unsigned'] = $column->getUnsigned();
} }
$fieldMapping['notnull'] = $column->getNotNull(); $fieldMapping['nullable'] = $column->getNotNull() ? false : true;
if (isset($fieldMapping['id'])) { if (isset($fieldMapping['id'])) {
$ids[] = $fieldMapping; $ids[] = $fieldMapping;

2
lib/Doctrine/ORM/Tools/Console/Command/ConvertDoctrine1SchemaCommand.php
View File

@ -136,7 +136,7 @@ EOT
$converter = new ConvertDoctrine1Schema($fromPaths); $converter = new ConvertDoctrine1Schema($fromPaths);
$metadata = $converter->getMetadata(); $metadata = $converter->getMetadata();
if ($metadatas) { if ($metadata) {
$output->write(PHP_EOL); $output->write(PHP_EOL);
foreach ($metadata as $class) { foreach ($metadata as $class) {