Read Token.user_id instead of Token.userid
#8521
Merged
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
seanh
commented
Feb 14, 2024
| @@ -55,6 +56,7 @@ class Token(Base, mixins.Timestamps): | |||
| index=True, | |||
| nullable=True, | |||
| ) | |||
| user: Mapped["User"] = sqlalchemy.orm.relationship(back_populates="tokens") | |||
There was a problem hiding this comment.
Add a relationship so you can do token.user to get a token's user (works via the token.user_id foreign key relationship)
seanh
commented
Feb 14, 2024
| @@ -42,7 +42,7 @@ def create(self, userid): | |||
| """ | |||
| user = self.user_svc.fetch(userid) | |||
| token = models.Token( | |||
| userid=user.userid, user_id=user.id, value=self._generate_token() | |||
| user=user, userid=user.userid, value=self._generate_token() | |||
There was a problem hiding this comment.
Writing both user (which writes user_id) and the old userid (this will be removed soon).
seanh
force-pushed
the
dont-use-Token.userid
branch
from
5970e3d
to
019985e
Compare
Remove all **reads** of the `Token.userid` column, replacing them with reads of the new `Token.user_id` column instead. This prepares the way for actually removing the `Token.userid` column. For now the code does still need to **write** `Token.userid` because it's not nullable.
seanh
force-pushed
the
dont-use-Token.userid
branch
from
019985e
to
812d23a
Compare
marcospri
approved these changes
Feb 15, 2024
27 tasks
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.
Remove all reads of the
Token.useridcolumn, replacing them with reads of the newToken.user_idcolumn instead.This prepares the way for actually removing the
Token.useridcolumn.For now the code does still need to write
Token.useridbecause it's not nullable.