rails-pg-adapter 0.1.10 → 0.1.12

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b67a7180bcec7946a649f7bdb65f8229fad8ce79781fbd2f3d35a29ab36ea11c
-  data.tar.gz: 0716b88ad57d47d6ac13e236689ca0e75a3523d499a25926e6160c1f095046d2
+  metadata.gz: b84b17ac8e8008860499554d460faba310b74cad9ab1121a47ae3546ce07869e
+  data.tar.gz: f60cd6ef5bd5a9d87ef55d51840d75ae0142ef3c3d86e14aed523784b2147b57
 SHA512:
-  metadata.gz: 5339a3671b5ca35033959dee30c970c4cda87da611cbe3497195e3dd65872a5d4ba7e4b6610ed181d7ece69cfed1d9ec6508bd7ec7ae5caa2893fb98ea2fc230
-  data.tar.gz: 2f7369561949f038a9a4fe56d19f4dc0c256747b959d4ef1e6c5d19449b9f53ec003038418a988fa421614d973536a31343698304db7dea3d4cb4d4aee6f8e54
+  metadata.gz: 7bc8312c2fa2ab807ebcc197b1f3e0e61bc700fe7b451e436c6667470f2df0a7300c773715ea7cc15fac75b0dba322ef67dedcedc135d479a139b1d4ec251ec0
+  data.tar.gz: dfb8e3d337d0905639f67cfb84101b0bad1232152d838238373b4ac0abca0e5256a174585b8866f424119b157597e5730e0e03a48f14989d67c8c9a92f0e8491

data/CHANGELOG.md

@@ -1,3 +1,15 @@
+## [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
+
+## [0.1.10] - 2023-05-04
+
+- Handle Connection refused
+
 ## [0.1.9] - 2023-05-04
 
 - Retry on too many connections error as well

data/lib/rails_pg_adapter/patch.rb

@@ -43,42 +43,52 @@ module RailsPgAdapter
 
     def exec_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      query, _ = args
       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 unless try_reconnect?(e)
 
-        if try_reconnect?(e)
-          sleep_time = sleep_times.shift
-          handle_error(e) unless sleep_time
-          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+        sleep_time = sleep_times.shift
+        if sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
           sleep(sleep_time)
+          connect
           retry
         else
-          handle_error(e)
+          handle_activerecord_error(e)
+          raise
         end
       end
     end
 
     def exec_no_cache(*args)
       sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      query, _ = args
       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 unless try_reconnect?(e)
 
-        if try_reconnect?(e)
-          sleep_time = sleep_times.shift
-          handle_error(e) unless sleep_time
-          warn("Retry query failed, retrying again in #{sleep_time} sec.")
+        sleep_time = sleep_times.shift
+        if sleep_time
+          warn("Retry query failed, retrying again in #{sleep_time} sec. Retrying: #{query}")
           sleep(sleep_time)
+          connect
           retry
         else
-          handle_error(e)
+          handle_activerecord_error(e)
+          raise
         end
       end
     end
@@ -87,28 +97,21 @@ 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!
-        raise(e)
-      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
 
+    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
+      raise(e)
     end
 
     def disconnect_conn!

data/lib/rails_pg_adapter/version.rb

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

metadata

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