rails-pg-adapter 0.1.12 → 0.1.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84b17ac8e8008860499554d460faba310b74cad9ab1121a47ae3546ce07869e
-  data.tar.gz: f60cd6ef5bd5a9d87ef55d51840d75ae0142ef3c3d86e14aed523784b2147b57
+  metadata.gz: 8c7e1211128c3e88c13486773bd6280d15350f06f6c94abbace1b84a8f47b3d9
+  data.tar.gz: 4a010d6eec75b677c9e902d5a054cb0db15072f6954330069f9cf21172068e7c
 SHA512:
-  metadata.gz: 7bc8312c2fa2ab807ebcc197b1f3e0e61bc700fe7b451e436c6667470f2df0a7300c773715ea7cc15fac75b0dba322ef67dedcedc135d479a139b1d4ec251ec0
-  data.tar.gz: dfb8e3d337d0905639f67cfb84101b0bad1232152d838238373b4ac0abca0e5256a174585b8866f424119b157597e5730e0e03a48f14989d67c8c9a92f0e8491
+  metadata.gz: 5fdb25eda60e57a8393761f5e4832d7d2551e02231b1a9c353bfe56f26d939ba5fbfb2a8404f77f383343a717e8019779228172fbfe9dc4bcca167b6553ae579
+  data.tar.gz: 2837781b10234cebc762f9f7ef61fa33ad08f4a5b0f990987bc9cc910b69115eb21644f8e15a9fb092fa7551c33225848847b18a40f7fe794b56976de19a2261

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## [0.1.14] - 2024-02-06
+
+- Capture the database system is in recovery mode error
+
+## [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

data/lib/rails_pg_adapter/patch.rb

@@ -16,6 +16,7 @@ module RailsPgAdapter
       "is not currently accepting connections",
       "too many connections",
       "Connection refused",
+      "the database system is in recovery mode"
     ].freeze
     CONNECTION_ERROR_RE = /#{CONNECTION_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
@@ -44,6 +45,7 @@ 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,
@@ -52,6 +54,7 @@ module RailsPgAdapter
         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)
 
         sleep_time = sleep_times.shift
@@ -70,6 +73,7 @@ module RailsPgAdapter
     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,
@@ -78,6 +82,7 @@ module RailsPgAdapter
         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)
 
         sleep_time = sleep_times.shift
@@ -103,7 +108,7 @@ module RailsPgAdapter
     def handle_activerecord_error(e)
       return unless ::RailsPgAdapter::Patch.failover_error?(e.message)
       warn("clearing connections due to #{e} - #{e.message}")
-      disconnect_conn!
+      throw_away!
     end
 
     def handle_schema_cache_error(e)
@@ -114,11 +119,6 @@ module RailsPgAdapter
       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.12"
+  VERSION = "0.1.14"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: rails-pg-adapter
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.14
 platform: ruby
 authors:
 - Tines Engineering
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-05-08 00:00:00.000000000 Z
+date: 2024-02-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -17,6 +17,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -24,6 +27,9 @@ dependencies:
     - - "~>"
       - !ruby/object:Gem::Version
         version: '6'
+    - - "<"
+      - !ruby/object:Gem::Version
+        version: '7'
 description: This project allows you to monkey patch ActiveRecord (PostgreSQL) and
   auto-heal applications in production when PostgreSQL database fails over or when
   a cached column (in ActiveRecord schema cache) is removed from the database from