activerecord-trilogy-adapter 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f6012f06cd5bd29a7bd180354fd0e65c3fd11784a6a7483fac9599d87baa1b68
-  data.tar.gz: bde2129ca1f647d6b7308c131d00ae012d614ad4aba36450f16fd3551bc303ce
+  metadata.gz: a64e0395be9ae813e0aec59643758f1a2cc813099c290d95b5c6fbbf8c03746e
+  data.tar.gz: 7a1e5be7180c1f84475a40b7a48fe3b717eca0b3c4550ec2e687351049dcfa4e
 SHA512:
-  metadata.gz: 0ae12198df3991bccc1a17a983050457b2483d33f40078d5bd4c99a2d475d5fbdb84a2510c0beb0db65c9ebb4e431e12115ab2830c0cd5901a75cea3dfd7f75a
-  data.tar.gz: 0aed27beca07c98b513a092345b125129999f5ec0180ee9df0c78b39348c73be71ef0ad78448a644733f8966636f8059ec43aa248b247e66fa7cfda2cb3bdae8
+  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,8 +56,6 @@ 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"
 
@@ -82,7 +73,7 @@ module ActiveRecord
         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
 
@@ -102,10 +93,12 @@ module ActiveRecord
             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
@@ -149,6 +142,7 @@ module ActiveRecord
       alias reset! reconnect!
 
       def disconnect!
+        super
         unless connection.nil?
           connection.close
           self.connection = nil
@@ -159,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?
 
@@ -212,9 +189,19 @@ 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

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

@@ -37,8 +37,10 @@ module TrilogyAdapter
           Errors::BrokenPipe.new(message)
         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.1.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.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - GitHub Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2022-09-26 00:00:00.000000000 Z
+date: 2023-03-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: trilogy
@@ -16,14 +16,14 @@ 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
@@ -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

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