Do not use null column definition

doctrine · May 5, 2022 · 9f0ff98 · 9f0ff98
1 parent 7e83c92
commit 9f0ff98
Showing 1 changed file with 4 additions and 5 deletions.
diff --git a/lib/Doctrine/ORM/Tools/SchemaTool.php b/lib/Doctrine/ORM/Tools/SchemaTool.php
@@ -701,15 +701,14 @@ private function gatherRelationJoinColumns(
 
                 $fieldMapping = $definingClass->getFieldMapping($referencedFieldName);
 
-                $columnDef = null;
+                $columnOptions = ['notnull' => false];
+
                 if (isset($joinColumn['columnDefinition'])) {
-                    $columnDef = $joinColumn['columnDefinition'];
+                    $columnOptions['columnDefinition'] = $joinColumn['columnDefinition'];
                 } elseif (isset($fieldMapping['columnDefinition'])) {
-                    $columnDef = $fieldMapping['columnDefinition'];
+                    $columnOptions['columnDefinition'] = $fieldMapping['columnDefinition'];
                 }
 
-                $columnOptions = ['notnull' => false, 'columnDefinition' => $columnDef];
-
                 if (isset($joinColumn['nullable'])) {
                     $columnOptions['notnull'] = ! $joinColumn['nullable'];
                 }