Clean up trilogy error translation #50891
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
This commit makes a few changes to our trilogy error translation: * trilogy-libraries/trilogy#118 introduced `Trilogy::EOFError` which we can use instead of matching on `TRILOGY_CLOSED_CONNECTION`. * trilogy-libraries/trilogy#15 introduced `Trilogy::ConnectionClosed`, which inherits from `IOError` for backwards compatibility. As far as I can tell that's the only `IOError` trilogy can raise, so this commit rescues the trilogy-specific error instead. * As far as I can tell Trilogy does not raise `SocketError`, so don't bother translating that * Don't treat TRILOGY_UNEXPECTED_PACKET as a connection error. If we get this, it's probably a bug in trilogy that we should fix. I'd like to eventually get rid of TRILOGY_INVALID_SEQUENCE_ID too, but we're currently relying on it in a few tests (related to trilogy missing caching_sha2_password auth support, if I recall correctly) I'm kinda hoping we'll eventually be able to simplify this to something like: ```rb if exception.is_a?(Trilogy::ConnectionError) ConnectionFailed.new(message, connection_pool: @pool) else super end ``` but we'd need more changes to trilogy before that is possible.
composerinteralia
force-pushed
the
trilogy-error-translate
branch
from
0324805
to
adfdbf8
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.
This commit makes a few changes to our trilogy error translation:
Trilogy::EOFErrorwhich we can use instead of matching onTRILOGY_CLOSED_CONNECTION.Trilogy::ConnectionClosed, which inherits fromIOErrorfor backwards compatibility. As far as I can tell that's the onlyIOErrortrilogy can raise, so this commit rescues the trilogy-specific error instead.SocketError, so don't bother translating thatTRILOGY_UNEXPECTED_PACKETas a connection error. If we get this, it's probably a bug in trilogy that we should fix. I'd like to eventually get rid ofTRILOGY_INVALID_SEQUENCE_IDtoo, but we're currently relying on it in a few tests (related to trilogy missing caching_sha2_password auth support, if I recall correctly)I'm kinda hoping we'll eventually be able to simplify this to something like:
but we'd need more changes to trilogy before that is possible.