Skip to content
Closed
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions lib/Doctrine/ORM/Tools/SchemaTool.php
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,12 @@ private function _gatherColumn($class, array $mapping, $table)
$options['columnDefinition'] = $mapping['columnDefinition'];
}

if (isset($mapping['options'])) {
Copy link
Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It should be noted that I placed options extraction to the end of the $options preparation process and this may lead to overwriting options defined by hand outside of the "options" (if it is a valid annotation tag param)

foreach ($mapping['options'] as $key => $value) {
$options[$key] = $value;
}
}

if ($class->isIdGeneratorIdentity() && $class->getIdentifierFieldNames() == array($mapping['fieldName'])) {
$options['autoincrement'] = true;
}
Expand Down