Remove call to Table::hasColumn()

The TableEditor API has no equivalent for this. Avoiding that call
should allow migrating to that API.

Author: greg0ire

src/Tools/SchemaTool.php

@@ -202,6 +202,7 @@ public function getSchemaFromMetadata(array $classes): Schema
         $blacklistedFks = [];
 
         foreach ($classes as $class) {
+            $columnNames = [];
             if ($this->processingNotRequired($class, $processedClasses)) {
                 continue;
             }
@@ -223,10 +224,11 @@ public function getSchemaFromMetadata(array $classes): Schema
                 // For new schema API: collect join tables to add after this entity table
                 $joinTablesToAdd = [];
 
-                $this->gatherColumns($class, $table);
+                $this->gatherColumns($class, $table, $columnNames);
                 $this->gatherRelationsSql(
                     $class,
                     $table,
+                    $columnNames,
                     $schema,
                     $addedFks,
                     $blacklistedFks,
@@ -245,10 +247,11 @@ public function getSchemaFromMetadata(array $classes): Schema
 
                 foreach ($class->subClasses as $subClassName) {
                     $subClass = $this->em->getClassMetadata($subClassName);
-                    $this->gatherColumns($subClass, $table);
+                    $this->gatherColumns($subClass, $table, $columnNames);
                     $this->gatherRelationsSql(
                         $subClass,
                         $table,
+                        $columnNames,
                         $schema,
                         $addedFks,
                         $blacklistedFks,
@@ -264,13 +267,14 @@ public function getSchemaFromMetadata(array $classes): Schema
                 // Add all non-inherited fields as columns
                 foreach ($class->fieldMappings as $fieldName => $mapping) {
                     if (! isset($mapping->inherited)) {
-                        $this->gatherColumn($class, $mapping, $table);
+                        $this->gatherColumn($class, $mapping, $table, $columnNames);
                     }
                 }
 
                 $this->gatherRelationsSql(
                     $class,
                     $table,
+                    $columnNames,
                     $schema,
                     $addedFks,
                     $blacklistedFks,
@@ -289,7 +293,7 @@ public function getSchemaFromMetadata(array $classes): Schema
                     foreach ($class->identifier as $identifierField) {
                         if (isset($class->fieldMappings[$identifierField]->inherited)) {
                             $idMapping = $class->fieldMappings[$identifierField];
-                            $this->gatherColumn($class, $idMapping, $table);
+                            $this->gatherColumn($class, $idMapping, $table, $columnNames);
                             $columnName = $this->quoteStrategy->getColumnName(
                                 $identifierField,
                                 $class,
@@ -361,10 +365,11 @@ public function getSchemaFromMetadata(array $classes): Schema
                 // For new schema API: collect join tables to add after this entity table
                 $joinTablesToAdd = [];
 
-                $this->gatherColumns($class, $table);
+                $this->gatherColumns($class, $table, $columnNames);
                 $this->gatherRelationsSql(
                     $class,
                     $table,
+                    $columnNames,
                     $schema,
                     $addedFks,
                     $blacklistedFks,
@@ -540,28 +545,32 @@ private function addDiscriminatorColumnDefinition(ClassMetadata $class, Table $t
     /**
      * Gathers the column definitions as required by the DBAL of all field mappings
      * found in the given class.
+     *
+     * @param array<string, true> $columnNames
      */
-    private function gatherColumns(ClassMetadata $class, Table $table): void
+    private function gatherColumns(ClassMetadata $class, Table $table, array &$columnNames): void
     {
         foreach ($class->fieldMappings as $mapping) {
             if ($class->isInheritanceTypeSingleTable() && isset($mapping->inherited)) {
                 continue;
             }
 
-            $this->gatherColumn($class, $mapping, $table);
+            $this->gatherColumn($class, $mapping, $table, $columnNames);
         }
     }
 
     /**
      * Creates a column definition as required by the DBAL from an ORM field mapping definition.
      *
-     * @param ClassMetadata $class The class that owns the field mapping.
+     * @param ClassMetadata       $class       The class that owns the field mapping.
+     * @param array<string, true> $columnNames The list of column names already added to the table.
      * @phpstan-param FieldMapping $mapping The field mapping.
      */
     private function gatherColumn(
         ClassMetadata $class,
         FieldMapping $mapping,
         Table $table,
+        array &$columnNames,
     ): void {
         $columnName = $this->quoteStrategy->getColumnName($mapping->fieldName, $class, $this->platform);
         $columnType = $mapping->type;
@@ -667,11 +676,11 @@ private function gatherColumn(
             $options['autoincrement'] = false;
         }
 
-        if ($table->hasColumn($columnName)) {
-            // required in some inheritance scenarios
+        if (isset($columnNames[$columnName])) {
             $table->modifyColumn($columnName, $options);
         } else {
             $table->addColumn($columnName, $columnType, $options);
+            $columnNames[$columnName] = true;
         }
 
         $isUnique = $mapping->unique ?? false;
@@ -689,6 +698,7 @@ private function gatherColumn(
      * Gathers the SQL for properly setting up the relations of the given class.
      * This includes the SQL for foreign key constraints and join tables.
      *
+     * @param array<string, true> $columnNames
      * @phpstan-param array<string, array{
      *                  foreignTableName: string,
      *                  foreignColumns: list<string>,
@@ -702,6 +712,7 @@ private function gatherColumn(
     private function gatherRelationsSql(
         ClassMetadata $class,
         Table $table,
+        array &$columnNames,
         Schema &$schema,
         array &$addedFks,
         array &$blacklistedFks,
@@ -721,6 +732,7 @@ private function gatherRelationsSql(
                 $this->gatherRelationJoinColumns(
                     $mapping->joinColumns,
                     $table,
+                    $columnNames,
                     $foreignClass,
                     $mapping,
                     $primaryKeyColumns,
@@ -753,11 +765,13 @@ private function gatherRelationsSql(
                 }
 
                 $primaryKeyColumns = [];
+                $joinColumnNames   = [];
 
                 // Build first FK constraint (relation table => source table)
                 $this->gatherRelationJoinColumns(
                     $joinTable->joinColumns,
                     $theJoinTable,
+                    $joinColumnNames,
                     $class,
                     $mapping,
                     $primaryKeyColumns,
@@ -769,6 +783,7 @@ private function gatherRelationsSql(
                 $this->gatherRelationJoinColumns(
                     $joinTable->inverseJoinColumns,
                     $theJoinTable,
+                    $joinColumnNames,
                     $foreignClass,
                     $mapping,
                     $primaryKeyColumns,
@@ -826,6 +841,7 @@ private function getDefiningClass(ClassMetadata $class, string $referencedColumn
     /**
      * Gathers columns and fk constraints that are required for one part of relationship.
      *
+     * @param array<string, true> $columnNames
      * @phpstan-param list<JoinColumnMapping>          $joinColumns
      * @phpstan-param list<string>                     $primaryKeyColumns
      * @phpstan-param array<string, array{
@@ -840,6 +856,7 @@ private function getDefiningClass(ClassMetadata $class, string $referencedColumn
     private function gatherRelationJoinColumns(
         array $joinColumns,
         Table $theJoinTable,
+        array &$columnNames,
         ClassMetadata $class,
         AssociationMapping $mapping,
         array &$primaryKeyColumns,
@@ -878,7 +895,7 @@ private function gatherRelationJoinColumns(
             $localColumns[]      = $quotedColumnName;
             $foreignColumns[]    = $quotedRefColumnName;
 
-            if (! $theJoinTable->hasColumn($quotedColumnName)) {
+            if (! isset($columnNames[$quotedColumnName])) {
                 // Only add the column to the table if it does not exist already.
                 // It might exist already if the foreign key is mapped into a regular
                 // property as well.
@@ -911,6 +928,7 @@ private function gatherRelationJoinColumns(
                 $columnOptions = $this->gatherColumnOptions($joinColumn) + $columnOptions;
 
                 $theJoinTable->addColumn($quotedColumnName, $fieldMapping->type, $columnOptions);
+                $columnNames[$quotedColumnName] = true;
             }
 
             if (isset($joinColumn->unique) && $joinColumn->unique === true) {