MySQL: Fix primary key alteration when adding new columns #2696
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
|
A feedback from someone of the doctrine/dbal team would be great. |
deeky666
suggested changes
Apr 14, 2017
| @@ -708,6 +709,10 @@ private function getPreAlterTableAlterPrimaryKeySQL(TableDiff $diff, Index $inde | |||
|
|
|||
| // Dropping primary keys requires to unset autoincrement attribute on the particular column first. | |||
| foreach ($index->getColumns() as $columnName) { | |||
| if(isset($diff->addedColumns[$columnName]) && $diff->addedColumns[$columnName] instanceof Column) { | |||
| continue; | |||
| } | |||
There was a problem hiding this comment.
I think using the following check is more convenient and safer concerning the following getColumn() call:
if (! $diff->fromTable->hasColumn($columnName)) {
continue;
}
drieschel
force-pushed
the
pk_add_column_mysql
branch
from
4e57458 to
55557d0
Compare
|
@deeky666 Done :) PS: The fix could also be added to branch 2.5. |
drieschel
force-pushed
the
pk_add_column_mysql
branch
from
55557d0 to
3717c49
Compare
deeky666
suggested changes
Apr 14, 2017
| @@ -708,6 +708,10 @@ private function getPreAlterTableAlterPrimaryKeySQL(TableDiff $diff, Index $inde | |||
|
|
|||
| // Dropping primary keys requires to unset autoincrement attribute on the particular column first. | |||
| foreach ($index->getColumns() as $columnName) { | |||
| if(!$diff->fromTable->hasColumn($columnName)) { | |||
There was a problem hiding this comment.
sorry to nitpick but we use the following code style if (! $diff can you please adjust that? afterwards I'll merge.
drieschel
force-pushed
the
pk_add_column_mysql
branch
from
3717c49 to
fb018c0
Compare
primary key on MySQL platform.
drieschel
force-pushed
the
pk_add_column_mysql
branch
from
fb018c0 to
fa2a12e
Compare
deeky666
approved these changes
Apr 26, 2017
|
@drieschel thanks! Backported to |
Sign up for free
to subscribe to this conversation on GitHub.
Already have an account?
Sign in.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Trying to get a column in a table which is not added yet, will result in throwing a SchemaException. Also altering not yet added columns does not make sense.