activerecord-trilogy-adapter 2.0.0 → 2.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82a7b7939a81514e90b6c5da24ab8e310a34629cce1c33bd300c1ffa1ca3176
-  data.tar.gz: 245b8be7fb7fa5672ce6db5598730120c7b401be3e2ec0b3b74fc3ad25592526
+  metadata.gz: f6012f06cd5bd29a7bd180354fd0e65c3fd11784a6a7483fac9599d87baa1b68
+  data.tar.gz: bde2129ca1f647d6b7308c131d00ae012d614ad4aba36450f16fd3551bc303ce
 SHA512:
-  metadata.gz: aa5f9afa69163d02a8d11c75c33c17a0a22a112b7f5ec33671c92b4900b185340665ddc01036a59227ad4e9d8199f86d745ce983dd84c74a54f8e6f3eb6d7538
-  data.tar.gz: 50496283df9b2dd9f7c23b0131951393696512bc2bb904bfd5b708401c7d8c8e875cec5a9ef1a8beae8869d3533c070a24f9b2b577acc8ad7ec04b1b8e9c67e2
+  metadata.gz: 0ae12198df3991bccc1a17a983050457b2483d33f40078d5bd4c99a2d475d5fbdb84a2510c0beb0db65c9ebb4e431e12115ab2830c0cd5901a75cea3dfd7f75a
+  data.tar.gz: 0aed27beca07c98b513a092345b125129999f5ec0180ee9df0c78b39348c73be71ef0ad78448a644733f8966636f8059ec43aa248b247e66fa7cfda2cb3bdae8

data/lib/active_record/connection_adapters/trilogy_adapter.rb

@@ -70,13 +70,32 @@ module ActiveRecord
 
       include DatabaseStatements
 
+      SSL_MODES = {
+        SSL_MODE_DISABLED: Trilogy::SSL_DISABLED,
+        SSL_MODE_PREFERRED: Trilogy::SSL_PREFERRED_NOVERIFY,
+        SSL_MODE_REQUIRED: Trilogy::SSL_REQUIRED_NOVERIFY,
+        SSL_MODE_VERIFY_CA: Trilogy::SSL_VERIFY_CA,
+        SSL_MODE_VERIFY_IDENTITY: Trilogy::SSL_VERIFY_IDENTITY
+      }.freeze
+
       class << self
         def new_client(config)
+          config[:ssl_mode] = parse_ssl_mode(config[:ssl_mode]) if config[:ssl_mode]
           ::Trilogy.new(config)
         rescue Trilogy::DatabaseError => error
           raise translate_connect_error(config, error)
         end
 
+        def parse_ssl_mode(mode)
+          return mode if mode.is_a? Integer
+
+          m = mode.to_s.upcase
+          # enable Mysql2 client compatibility
+          m = "SSL_MODE_#{m}" unless m.start_with? "SSL_MODE_"
+
+          SSL_MODES.fetch(m.to_sym, mode)
+        end
+
         def translate_connect_error(config, error)
           case error.error_code
           when ER_BAD_DB_ERROR
@@ -116,7 +135,9 @@ module ActiveRecord
       end
 
       def quote_string(string)
-        any_raw_connection.escape string
+        with_raw_connection(allow_retry: true, uses_transaction: false) do |conn|
+          conn.escape(string)
+        end
       end
 
       def active?
@@ -199,7 +220,9 @@ module ActiveRecord
         end
 
         def get_full_version
-          any_raw_connection.server_info[:version]
+          with_raw_connection(allow_retry: true, uses_transaction: false) do |conn|
+            conn.server_info[:version]
+          end
         end
 
         def translate_exception(exception, message:, sql:, binds:)
@@ -208,6 +231,10 @@ module ActiveRecord
           ::TrilogyAdapter::LostConnectionExceptionTranslator.
             new(exception, message, error_code).translate || super
         end
+
+        def default_prepared_statements
+          false
+        end
     end
   end
 end

data/lib/trilogy_adapter/lost_connection_exception_translator.rb

@@ -35,7 +35,7 @@ module TrilogyAdapter
         case exception
         when Errno::EPIPE
           Errors::BrokenPipe.new(message)
-        when SocketError
+        when SocketError, IOError
           Errors::SocketError.new(message)
         when Errno::ECONNRESET
           Errors::ConnectionResetByPeer.new(message)

data/lib/trilogy_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TrilogyAdapter
-  VERSION = "2.0.0"
+  VERSION = "2.1.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-trilogy-adapter
 version: !ruby/object:Gem::Version
-  version: 2.0.0
+  version: 2.1.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2022-09-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trilogy
@@ -28,16 +28,16 @@ dependencies:
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0.alpha
+        version: 7.1.a
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: 7.1.0.alpha
+        version: 7.1.a
 - !ruby/object:Gem::Dependency
   name: minitest
   requirement: !ruby/object:Gem::Requirement
@@ -136,7 +136,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
+rubygems_version: 3.2.33
 signing_key:
 specification_version: 4
 summary: Active Record adapter for https://github.com/github/trilogy.