Merge pull request #5 from phcorp/master

fix columns names duplicates
janalis · Mar 20, 2017 · 96a6096 · 96a6096
2 parents 7785a9f + b4ea9ab
commit 96a6096
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 3 deletions.
diff --git 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
@@ -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;