[24.1] Fix bad merge conflict resolution #19296
Closed
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
github-actions
bot
added
the
area/database
mvdbeek
reviewed
Dec 10, 2024
| @@ -2630,7 +2630,9 @@ class PostJobAction(Base, RepresentById): | |||
| workflow_step_id: Mapped[Optional[int]] = mapped_column(ForeignKey("workflow_step.id"), index=True) | |||
| action_type: Mapped[str] = mapped_column(String(255)) | |||
| output_name: Mapped[Optional[str]] = mapped_column(String(255)) | |||
| _action_arguments: Mapped[Optional[bytes]] = mapped_column(MutableJSONType) | |||
| _action_arguments: Mapped[Optional[Union[bool, Dict[str, Any]]]] = mapped_column( | |||
There was a problem hiding this comment.
While we can have bool in the database the type checker should complain if you attempt this. Do things fail with
Suggested change
| _action_arguments: Mapped[Optional[Union[bool, Dict[str, Any]]]] = mapped_column( | |
| _action_arguments: Mapped[Optional[Dict[str, Any]]] = mapped_column( |
?
There was a problem hiding this comment.
It doesn't fail, but at line 2650 we are checking as if it's potentially a bool:
if ... and self._action_arguments is True:so I suppose a future version of mypy may complain about this.
I think this is correct.
There was a problem hiding this comment.
Then in that future version we ignore the type (or migrate the buggy values in the column). We should never ever set booleans in that column, any attempt to do so is a bug.
4 tasks
|
Replaced by #19297 . |
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.
Apologies!
How to test the changes?
(Select all options that apply)
License