activerecord-trilogy-adapter 2.0.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c82a7b7939a81514e90b6c5da24ab8e310a34629cce1c33bd300c1ffa1ca3176
-  data.tar.gz: 245b8be7fb7fa5672ce6db5598730120c7b401be3e2ec0b3b74fc3ad25592526
+  metadata.gz: a64e0395be9ae813e0aec59643758f1a2cc813099c290d95b5c6fbbf8c03746e
+  data.tar.gz: 7a1e5be7180c1f84475a40b7a48fe3b717eca0b3c4550ec2e687351049dcfa4e
 SHA512:
-  metadata.gz: aa5f9afa69163d02a8d11c75c33c17a0a22a112b7f5ec33671c92b4900b185340665ddc01036a59227ad4e9d8199f86d745ce983dd84c74a54f8e6f3eb6d7538
-  data.tar.gz: 50496283df9b2dd9f7c23b0131951393696512bc2bb904bfd5b708401c7d8c8e875cec5a9ef1a8beae8869d3533c070a24f9b2b577acc8ad7ec04b1b8e9c67e2
+  metadata.gz: b4e7aa7c78d2773783d578708d8267633f006db9f89eba45d58fb172e5fcb8a0bc8b0b4b70542c6cc4900ad0fd217706765db035601b0b862df1bbbf3d79c02e
+  data.tar.gz: f508049eb78a987e12c2e18480516b2ffced87c41a8517aaa95a3e24585b2bbb6ae181e1dd4abf8f6889155bf76e351f5912bb74c5deeeff63fce970b303b835

data/lib/active_record/connection_adapters/trilogy_adapter.rb

@@ -30,13 +30,6 @@ module ActiveRecord
           MySQL::ExplainPrettyPrinter.new.pp(result, elapsed)
         end
 
-        def execute(sql, name = nil, async: false)
-          sql = transform_query(sql)
-          check_if_write_query(sql)
-
-          raw_execute(sql, name, async: async)
-        end
-
         def exec_query(sql, name = "SQL", binds = [], prepare: false, async: false)
           result = execute(sql, name, async: async)
           ActiveRecord::Result.new(result.fields, result.to_a)
@@ -63,30 +56,49 @@ module ActiveRecord
 
       ER_BAD_DB_ERROR = 1049
       ER_ACCESS_DENIED_ERROR = 1045
-      ER_CONN_HOST_ERROR = 2003
-      ER_UNKNOWN_HOST_ERROR = 2005
 
       ADAPTER_NAME = "Trilogy"
 
       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
+        rescue Trilogy::ConnectionError, Trilogy::ProtocolError => 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
             ActiveRecord::NoDatabaseError.db_error(config[:database])
           when ER_ACCESS_DENIED_ERROR
             ActiveRecord::DatabaseConnectionError.username_error(config[:username])
-          when ER_CONN_HOST_ERROR, ER_UNKNOWN_HOST_ERROR
-            ActiveRecord::DatabaseConnectionError.hostname_error(config[:host])
           else
-            ActiveRecord::ConnectionNotEstablished.new(error.message)
+            if error.message.match?(/TRILOGY_DNS_ERROR/)
+              ActiveRecord::DatabaseConnectionError.hostname_error(config[:host])
+            else
+              ActiveRecord::ConnectionNotEstablished.new(error.message)
+            end
           end
         end
       end
@@ -116,7 +128,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?
@@ -128,6 +142,7 @@ module ActiveRecord
       alias reset! reconnect!
 
       def disconnect!
+        super
         unless connection.nil?
           connection.close
           self.connection = nil
@@ -138,23 +153,6 @@ module ActiveRecord
         self.connection = nil
       end
 
-      def raw_execute(sql, name, async: false, allow_retry: false, uses_transaction: true)
-        mark_transaction_written_if_write(sql)
-
-        log(sql, name, async: async) do
-          with_raw_connection(allow_retry: allow_retry, uses_transaction: uses_transaction) do |conn|
-            # Sync any changes since connection last established.
-            if default_timezone == :local
-              conn.query_flags |= ::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
-            else
-              conn.query_flags &= ~::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
-            end
-
-            conn.query(sql)
-          end
-        end
-      end
-
       def each_hash(result)
         return to_enum(:each_hash, result) unless block_given?
 
@@ -191,15 +189,27 @@ module ActiveRecord
 
         def reconnect
           connection&.close
+          self.connection = nil
           connect
         end
 
+        def sync_timezone_changes(conn)
+          # Sync any changes since connection last established.
+          if default_timezone == :local
+            conn.query_flags |= ::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
+          else
+            conn.query_flags &= ~::Trilogy::QUERY_FLAGS_LOCAL_TIMEZONE
+          end
+        end
+
         def full_version
           schema_cache.database_version.full_version_string
         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 +218,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/connection.rb

@@ -14,6 +14,10 @@ module TrilogyAdapter
   #                                           host: "localhost",
   #                                           database: "demo_development"
   module Connection
+    def trilogy_adapter_class
+      ActiveRecord::ConnectionAdapters::TrilogyAdapter
+    end
+
     def trilogy_connection(config)
       configuration = config.dup
 
@@ -31,7 +35,7 @@ module TrilogyAdapter
         0
       ]
 
-      ActiveRecord::ConnectionAdapters::TrilogyAdapter.new nil, logger, options, configuration
+      trilogy_adapter_class.new nil, logger, options, configuration
     end
   end
 end

data/lib/trilogy_adapter/lost_connection_exception_translator.rb

@@ -35,10 +35,12 @@ 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)
+        when Trilogy::ConnectionError
+          if message.match?(/Connection reset by peer/)
+            Errors::ConnectionResetByPeer.new(message)
+          end
         end
       end
 

data/lib/trilogy_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module TrilogyAdapter
-  VERSION = "2.0.0"
+  VERSION = "2.2.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.2.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-08-10 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trilogy
@@ -16,28 +16,28 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 2.1.1
+        version: 2.3.0
 - !ruby/object:Gem::Dependency
   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
@@ -111,7 +111,6 @@ files:
 - lib/trilogy_adapter/connection.rb
 - lib/trilogy_adapter/errors.rb
 - lib/trilogy_adapter/lost_connection_exception_translator.rb
-- lib/trilogy_adapter/rails/dbconsole.rb
 - lib/trilogy_adapter/railtie.rb
 - lib/trilogy_adapter/version.rb
 homepage: https://github.com/github/activerecord-trilogy-adapter
@@ -136,7 +135,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.

data/lib/trilogy_adapter/rails/dbconsole.rb

@@ -1,21 +0,0 @@
-# frozen_string_literal: true
-
-module TrilogyAdapter
-  module Rails
-    module DBConsole
-      class AdapterAdapter < SimpleDelegator
-        def adapter
-          "mysql"
-        end
-      end
-
-      def db_config
-        if super.adapter == "trilogy"
-          AdapterAdapter.new(super)
-        else
-          super
-        end
-      end
-    end
-  end
-end