-
-
Notifications
You must be signed in to change notification settings - Fork 313
Fix MySQL native ENUM autogenerate detection #1746
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
Open
furkankoykiran
wants to merge
4
commits into
sqlalchemy:main
Choose a base branch
from
furkankoykiran:fix/mysql-native-enum-autogenerate
base: main
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.
+80
−0
Open
Changes from all commits
Commits
Show all changes
4 commits
Select commit
Hold shift + click to select a range
14cfe65
Fix MySQL native ENUM autogenerate detection
furkankoykiran 600418b
Simplify MySQL ENUM compare_type implementation
furkankoykiran 5031ce9
Fix test imports and formatting
furkankoykiran 9a9a042
style: address feedback on enum order comment and imports
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -350,6 +350,31 @@ def correct_for_autogen_foreignkeys(self, conn_fks, metadata_fks): | |
| ): | ||
| cnfk.onupdate = "RESTRICT" | ||
|
|
||
| def compare_type( | ||
| self, | ||
| inspector_column: schema.Column[Any], | ||
| metadata_column: schema.Column, | ||
| ) -> bool: | ||
| """Override compare_type to properly detect MySQL native ENUM changes. | ||
|
|
||
| This addresses the issue where autogenerate fails to detect when new | ||
| values are added to or removed from MySQL native ENUM columns. | ||
| """ | ||
| metadata_type = metadata_column.type | ||
| inspector_type = inspector_column.type | ||
|
|
||
| # Check if both columns are MySQL native ENUMs | ||
| if isinstance(metadata_type, sqltypes.Enum) and isinstance( | ||
| inspector_type, sqltypes.Enum | ||
| ): | ||
| # Compare the actual enum values; order matters for MySQL ENUMs. | ||
| # Changing the order of ENUM values is a schema change in MySQL. | ||
| if metadata_type.enums != inspector_type.enums: | ||
|
Collaborator
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Federico Caselli (CaselIT) wrote: could we use set here? I don't think the order matters View this in Gerrit at https://gerrit.sqlalchemy.org/c/sqlalchemy/alembic/+/6520 |
||
| return True | ||
|
|
||
| # Fall back to default comparison for non-ENUM types | ||
| return super().compare_type(inspector_column, metadata_column) | ||
|
|
||
|
|
||
| class MariaDBImpl(MySQLImpl): | ||
| __dialect__ = "mariadb" | ||
|
|
||
This file contains hidden or 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
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.
Uh oh!
There was an error while loading. Please reload this page.