rails-pg-adapter 0.1.11 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97170715fde6ba059d296a9fbce17b22b1c0e4a40d48473992d02d8368b96963
-  data.tar.gz: 51099b75bbaaa27a0f8120a865da60da33a21e35b262802843ba29791c8d572f
+  metadata.gz: ee063dc61ffb7297dd7591706c9cfb816dbbe1a407abf9d997a6c151cab1ad49
+  data.tar.gz: f80b24aed7b4c65d73af05cac66d35dd25a0fb7d80f7f5fff9423a833d857745
 SHA512:
-  metadata.gz: 1458a06466189759dee8b82cea49adbf856cac36937ead93975d47439d4f962033a5a4c01f9bcce871c919a0c7c4341f7b07c62c7c5f882cd98ffde70b685e06
-  data.tar.gz: 563aef7c452bfd98266543597ed5cb2502d2047fe0cd586522bc431aa441b86b799c494a5f4c69f03047a52fba2a5b916dac553160f07976e6b05445e431454c
+  metadata.gz: 206eedbdd47a2a56a41a4386cb213aded7beeec53e375ec6adb13b116defac8cdfe506e1f989dc511189e8474d072a2776f94dabb2b751ba9576f1dff2e144f7
+  data.tar.gz: 716f19553e8f15afae93d099f4e5ec81927d9f7a69f134fc92e97e83aa428bc30ccf7947fa59727db6a0c142de576823ecdda4c022352f8e726bf1bc97f99458

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.1.13] - 2023-05-09
+
+- Use throw_away! instead and capture state of transaction and re-raise accordingly
+
+## [0.1.12] - 2023-05-08
+
+- Slight refactor and reduce multiple disconnect attempts
+
 ## [0.1.11] - 2023-05-08
 
 - Attempt a re-connect before a retry

data/lib/rails_pg_adapter/patch.rb

@@ -44,40 +44,56 @@ module RailsPgAdapter
     def exec_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       query, _ = args
+      within_transaction = in_transaction? # capture in_transaction? state before retries
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
         raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+        handle_schema_cache_error(e)
+        handle_activerecord_error(e)
+        raise if within_transaction
+        raise unless try_reconnect?(e)
 
-        handle_error(e) unless try_reconnect?(e)
         sleep_time = sleep_times.shift
-        handle_error(e) unless sleep_time
-        warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
-        sleep(sleep_time)
-        connect
-        retry
+        if sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
+          sleep(sleep_time)
+          connect
+          retry
+        else
+          handle_activerecord_error(e)
+          raise
+        end
       end
     end
 
     def exec_no_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       query, _ = args
+      within_transaction = in_transaction? # capture in_transaction? state before retries
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
         raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+        handle_schema_cache_error(e)
+        handle_activerecord_error(e)
+        raise if within_transaction
+        raise unless try_reconnect?(e)
 
-        handle_error(e) unless try_reconnect?(e)
         sleep_time = sleep_times.shift
-        handle_error(e) unless sleep_time
-        warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
-        sleep(sleep_time)
-        connect
-        retry
+        if sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
+          sleep(sleep_time)
+          connect
+          retry
+        else
+          handle_activerecord_error(e)
+          raise
+        end
       end
     end
 
@@ -85,33 +101,23 @@ module RailsPgAdapter
       return false if in_transaction?
       return false unless ::RailsPgAdapter::Patch.failover_error?(e.message)
       return false unless ::RailsPgAdapter.reconnect_with_backoff?
-
-      begin
-        disconnect_conn!
-        true
-      rescue ::ActiveRecord::ConnectionNotEstablished
-        false
-      end
+      true
     end
 
-    def handle_error(e)
-      if ::RailsPgAdapter::Patch.failover_error?(e.message)
-        warn("clearing connections due to #{e} - #{e.message}")
-        disconnect_conn!
-      end
+    def handle_activerecord_error(e)
+      return unless ::RailsPgAdapter::Patch.failover_error?(e.message)
+      warn("clearing connections due to #{e} - #{e.message}")
+      throw_away!
+    end
 
-      raise(e) unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
+    def handle_schema_cache_error(e)
+      return unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
       warn("clearing column information due to #{e} - #{e.message}")
 
       internal_clear_schema_cache!
       raise(e)
     end
 
-    def disconnect_conn!
-      disconnect!
-      ::ActiveRecord::Base.connection_pool.remove(::ActiveRecord::Base.connection)
-    end
-
     def internal_clear_schema_cache!
       ::ActiveRecord::Base.connection_pool.connections.each { |conn| conn.schema_cache.clear! }
       ::ActiveRecord::Base.descendants.each(&:reset_column_information)

data/lib/rails_pg_adapter/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module RailsPgAdapter
-  VERSION = "0.1.11"
+  VERSION = "0.1.13"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.13
 platform: ruby
 authors:
 - Tines Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2023-05-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails