From b4ea9ab64a2188e9c31a9b904ed501f7b82a7499 Mon Sep 17 00:00:00 2001 From: Pierre Hennequart Date: Mon, 20 Mar 2017 13:02:44 +0100 Subject: [PATCH] fix columns names duplicates --- src/Command/DoctrinevizCommand.php | 6 +++--- test/Entity/User.php | 6 ++++++ 2 files changed, 9 insertions(+), 3 deletions(-) diff --git a/src/Command/DoctrinevizCommand.php b/src/Command/DoctrinevizCommand.php index 2a1c576..91cad2e 100644 --- a/src/Command/DoctrinevizCommand.php +++ b/src/Command/DoctrinevizCommand.php @@ -134,14 +134,14 @@ public function execute(InputInterface $input, OutputInterface $output) $to = $graph->getVertex($tables[$targetEntity]->getId())->getRecord(array_values($columns)[0]); if (!$to) { $to = new Record($this->getFieldMappingDisplayName([ - 'fieldName' => array_values($columns)[0], + 'columnName' => array_values($columns)[0], ])); $tables[$targetEntity]->addRecord($to); } $from = $graph->getVertex($tables[$entity]->getId())->getRecord(array_keys($columns)[0]); if (!$from) { $from = new Record($this->getFieldMappingDisplayName([ - 'fieldName' => array_keys($columns)[0], + 'columnName' => array_keys($columns)[0], ])); $tables[$entity]->addRecord($from); } @@ -193,7 +193,7 @@ protected function getCardinality(array $fieldMapping) * * @return string */ - protected function getFieldMappingDisplayName(array $fieldMapping, $nameKey = 'fieldName') + protected function getFieldMappingDisplayName(array $fieldMapping, $nameKey = 'columnName') { $name = $fieldMapping[$nameKey]; $type = array_key_exists('type', $fieldMapping) ? $fieldMapping['type'] : 'integer'; diff --git a/test/Entity/User.php b/test/Entity/User.php index aef3059..9dd3416 100644 --- a/test/Entity/User.php +++ b/test/Entity/User.php @@ -40,8 +40,14 @@ class User */ protected $lastName; + /** + * @ORM\Column(name="email_id", type="integer") + */ + protected $idEmail; + /** * @ORM\OneToOne(targetEntity="Email") + * @ORM\JoinColumn(name="email_id", referencedColumnName="id") */ protected $email;