-
-
Notifications
You must be signed in to change notification settings - Fork 1.3k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Rework AbstractPlatform code for table and column creation #6808
Open
morozov
wants to merge
6
commits into
doctrine:5.0.x
Choose a base branch
from
morozov:rework-column-creation
base: 5.0.x
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
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
morozov
commented
Feb 24, 2025
Comment on lines
-615
to
+610
$modifyColumnSQL[] = $newColumn->getObjectName()->toSQL($this) . $newSQL; | ||
$modifyColumnSQL[] = $newSQL; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
This was a hack. From the SQL syntax perspective, a column name followed by the column definition (which also starts with the column name) doesn't make sense. This code worked only because the column definition was generated for a column with empty name (which is also invalid).
22923e2
to
f146c57
Compare
…rm::getCreateTableSQL()
f146c57
to
8610346
Compare
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
$options
parameter of theAbstractPlatform#_getCreateTableSQL()
non-optional and marking certain keys of theCreateTableParameters
array as non-optional allows to remove someif (!empty($options[...]))
checks. They are always passed.$name
parameter of theAbstractPlatform#getColumnDeclarationSQL()
was redundant as the$column
parameter always contains the column name.primary
key of theCreateTableParameters
array was redundant as theprimary_index
key already contains the wholeIndex
definition.AbstractPlatform#_getCreateTableSQL()
method implementations ofAbstractPlatform
and subclasses, calls toAbstractPlatform#getColumnDeclarationListSQL()
have been replaced with aforeach
loop and calls toAbstractPlatform#getColumnDeclarationSQL()
. The "list" method has the same implementation for all platforms and doesn't do anything than iteration. It produces a comma separated list of column declarations, which is later augmented with constraint declarations, etc. From the code organization standpoint, it's easier to operate on an array and join it once.TODO in 4.3.x:
AbstractPlatform#getColumnDeclarationListSQL()
as internal or deprecate (it is only used in a test that creates a temporary table in a way that it's not supposed to).Backport changes fromThere's another bug that makes adding a new PK with quoted columns on MySQL not work, so we cannot test this yet.AbstractMySQLPlatform
where a call toIndex#getColumns()
is replaced withIndex#getQuotedColumns()
. Not quoting column names in SQL is a bug.