rails-pg-adapter 0.1.11 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 97170715fde6ba059d296a9fbce17b22b1c0e4a40d48473992d02d8368b96963
-  data.tar.gz: 51099b75bbaaa27a0f8120a865da60da33a21e35b262802843ba29791c8d572f
+  metadata.gz: b84b17ac8e8008860499554d460faba310b74cad9ab1121a47ae3546ce07869e
+  data.tar.gz: f60cd6ef5bd5a9d87ef55d51840d75ae0142ef3c3d86e14aed523784b2147b57
 SHA512:
-  metadata.gz: 1458a06466189759dee8b82cea49adbf856cac36937ead93975d47439d4f962033a5a4c01f9bcce871c919a0c7c4341f7b07c62c7c5f882cd98ffde70b685e06
-  data.tar.gz: 563aef7c452bfd98266543597ed5cb2502d2047fe0cd586522bc431aa441b86b799c494a5f4c69f03047a52fba2a5b916dac553160f07976e6b05445e431454c
+  metadata.gz: 7bc8312c2fa2ab807ebcc197b1f3e0e61bc700fe7b451e436c6667470f2df0a7300c773715ea7cc15fac75b0dba322ef67dedcedc135d479a139b1d4ec251ec0
+  data.tar.gz: dfb8e3d337d0905639f67cfb84101b0bad1232152d838238373b4ac0abca0e5256a174585b8866f424119b157597e5730e0e03a48f14989d67c8c9a92f0e8491

data/CHANGELOG.md

@@ -1,3 +1,7 @@
+## [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

@@ -50,14 +50,20 @@ module RailsPgAdapter
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
         raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+        handle_schema_cache_error(e)
+        handle_activerecord_error(e)
+        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
 
@@ -70,14 +76,20 @@ module RailsPgAdapter
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
         raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
+        handle_schema_cache_error(e)
+        handle_activerecord_error(e)
+        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,22 +97,17 @@ 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}")
+      disconnect_conn!
+    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!

data/lib/rails_pg_adapter/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.11
+  version: 0.1.12
 platform: ruby
 authors:
 - Tines Engineering