mirrors
/
rails
mirror of https://github.com/rails/rails
8
0
Fork 0
Code Issues Projects Releases Wiki Activity

Clean up trilogy error translation 

This commit makes a few changes to our trilogy error translation:

* https://github.com/trilogy-libraries/trilogy/pull/118 introduced
  `Trilogy::EOFError` which we can use instead of matching on
  `TRILOGY_CLOSED_CONNECTION`.
* https://github.com/trilogy-libraries/trilogy/pull/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.
This commit is contained in:
Daniel Colson 2024-01-25 19:57:26 -05:00
parent 68eade83c8
commit adfdbf8c29
No known key found for this signature in database
GPG Key ID: 88A364BBE77B1353
1 changed files with 2 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
activerecord/lib/active_record/connection_adapters/trilogy_adapter.rb
View File

@ -202,11 +202,10 @@ module ActiveRecord
end
case exception
when SocketError, IOError
when ::Trilogy::ConnectionClosed, ::Trilogy::EOFError
return ConnectionFailed.new(message, connection_pool: @pool)
when ::Trilogy::Error
if /TRILOGY_CLOSED_CONNECTION|TRILOGY_INVALID_SEQUENCE_ID|TRILOGY_UNEXPECTED_PACKET/.match?(exception.message) ||
exception.is_a?(SystemCallError)
if exception.is_a?(SystemCallError) || exception.message.include?("TRILOGY_INVALID_SEQUENCE_ID")
return ConnectionFailed.new(message, connection_pool: @pool)
end
end