Inheritance: handle different pk column name

Author: homersimpsons

src/Utils/BeanDescriptor.php

@@ -230,7 +230,7 @@ public function getPropertiesWithDefault(): array
     public function getExposedProperties(): array
     {
         $exposedProperties = array_filter($this->beanPropertyDescriptors, function (AbstractBeanPropertyDescriptor $property) {
-            return $property->getTable()->getName() == $this->table->getName();
+            return !$property instanceof ScalarReferencePropertyDescriptor && $property->getTable()->getName() === $this->table->getName();
         });
 
         return $exposedProperties;
@@ -256,7 +256,7 @@ private function getProperties(Table $table): array
             $localProperties = $this->getPropertiesForTable($table);
             foreach ($localProperties as $name => $property) {
                 // We do not override properties if this is a primary key!
-                if ($property->isPrimaryKey()) {
+                if (!$property instanceof ScalarReferencePropertyDescriptor && $property->isPrimaryKey()) {
                     continue;
                 }
                 $properties[$name] = $property;
@@ -279,14 +279,14 @@ private function getPropertiesForTable(Table $table): array
     {
         $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
         if ($parentRelationship) {
-            $ignoreColumns = $parentRelationship->getUnquotedLocalColumns();
+            $ignoreColumns = $parentRelationship->getUnquotedForeignColumns();
         } else {
             $ignoreColumns = [];
         }
 
         $beanPropertyDescriptors = [];
         foreach ($table->getColumns() as $column) {
-            if (array_search($column->getName(), $ignoreColumns) !== false) {
+            if (in_array($column->getName(), $ignoreColumns, true)) {
                 continue;
             }
 
@@ -300,11 +300,18 @@ private function getPropertiesForTable(Table $table): array
                 }
                 // Check that this property is not an inheritance relationship
                 $parentRelationship = $this->schemaAnalyzer->getParentRelationship($table->getName());
-                if ($parentRelationship === $fk) {
-                    continue;
+                if ($parentRelationship !== null && $parentRelationship->getName() === $fk->getName()) {
+                    $beanPropertyDescriptors[] = new ScalarReferencePropertyDescriptor(
+                        $table,
+                        $column,
+                        $this->namingStrategy,
+                        $this->annotationParser,
+                        new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy, $this->annotationParser)
+                    );
+                } else {
+                    $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser, $this->registry->getBeanForTableName($fk->getForeignTableName()));;
                 }
 
-                $beanPropertyDescriptors[] = new ObjectBeanPropertyDescriptor($table, $fk, $this->namingStrategy, $this->beanNamespace, $this->annotationParser, $this->registry->getBeanForTableName($fk->getForeignTableName()));
             } else {
                 $beanPropertyDescriptors[] = new ScalarBeanPropertyDescriptor($table, $column, $this->namingStrategy, $this->annotationParser);
             }

src/Utils/DefaultNamingStrategy.php

@@ -312,11 +312,11 @@ protected function getUpperCamelCaseName(AbstractBeanPropertyDescriptor $propert
     {
         if ($property instanceof ObjectBeanPropertyDescriptor) {
             return $this->getForeignKeyUpperCamelCaseName($property->getForeignKey(), $property->isAlternativeName());
-        } elseif ($property instanceof ScalarBeanPropertyDescriptor) {
+        }
+        if ($property instanceof ScalarBeanPropertyDescriptor) {
             return $this->getScalarColumnUpperCamelCaseName($property->getColumnName(), $property->isAlternativeName());
-        } else {
-            throw new TDBMException('Unexpected property type. Should be either ObjectBeanPropertyDescriptor or ScalarBeanPropertyDescriptor'); // @codeCoverageIgnore
         }
+        throw new TDBMException('Unexpected property type. Should be either ObjectBeanPropertyDescriptor or ScalarBeanPropertyDescriptor'); // @codeCoverageIgnore
     }
 
     private function getSchema(): Schema

src/Utils/ObjectBeanPropertyDescriptor.php

@@ -258,6 +258,9 @@ private function getLazySerializeCode(string $propertyAccess): string
         $rows = [];
         foreach ($this->getForeignKey()->getUnquotedForeignColumns() as $column) {
             $descriptor = $this->getBeanPropertyDescriptor($column);
+            if ($descriptor instanceof ScalarReferencePropertyDescriptor) {
+                $descriptor = $descriptor->getReferencedPropertyDescriptor();
+            }
             $indexName = ltrim($descriptor->getVariableName(), '$');
             $columnGetterName = $descriptor->getGetterName();
             $rows[] = "'$indexName' => $propertyAccess->$columnGetterName()";

src/Utils/ScalarReferencePropertyDescriptor.php

@@ -0,0 +1,37 @@
+<?php
+
+
+namespace TheCodingMachine\TDBM\Utils;
+
+use Doctrine\DBAL\Schema\Column;
+use Doctrine\DBAL\Schema\Table;
+use TheCodingMachine\TDBM\Utils\Annotation\AnnotationParser;
+
+/**
+ * This class represents a reference to a AbstractBeanPropertyDescriptor
+ */
+class ScalarReferencePropertyDescriptor extends ScalarBeanPropertyDescriptor
+{
+    /** @var AbstractBeanPropertyDescriptor */
+    private $referencedPropertyDescriptor;
+
+    public function __construct(
+        Table $table,
+        Column $column,
+        NamingStrategyInterface $namingStrategy,
+        AnnotationParser $annotationParser,
+        AbstractBeanPropertyDescriptor $referencedPropertyDescriptor
+    )
+    {
+        parent::__construct($table, $column, $namingStrategy, $annotationParser);
+        $this->referencedPropertyDescriptor = $referencedPropertyDescriptor;
+    }
+
+    /**
+     * @return AbstractBeanPropertyDescriptor
+     */
+    public function getReferencedPropertyDescriptor(): AbstractBeanPropertyDescriptor
+    {
+        return $this->referencedPropertyDescriptor;
+    }
+}