rails-pg-adapter 0.1.12 → 0.1.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b84b17ac8e8008860499554d460faba310b74cad9ab1121a47ae3546ce07869e
-  data.tar.gz: f60cd6ef5bd5a9d87ef55d51840d75ae0142ef3c3d86e14aed523784b2147b57
+  metadata.gz: ee063dc61ffb7297dd7591706c9cfb816dbbe1a407abf9d997a6c151cab1ad49
+  data.tar.gz: f80b24aed7b4c65d73af05cac66d35dd25a0fb7d80f7f5fff9423a833d857745
 SHA512:
-  metadata.gz: 7bc8312c2fa2ab807ebcc197b1f3e0e61bc700fe7b451e436c6667470f2df0a7300c773715ea7cc15fac75b0dba322ef67dedcedc135d479a139b1d4ec251ec0
-  data.tar.gz: dfb8e3d337d0905639f67cfb84101b0bad1232152d838238373b4ac0abca0e5256a174585b8866f424119b157597e5730e0e03a48f14989d67c8c9a92f0e8491
+  metadata.gz: 206eedbdd47a2a56a41a4386cb213aded7beeec53e375ec6adb13b116defac8cdfe506e1f989dc511189e8474d072a2776f94dabb2b751ba9576f1dff2e144f7
+  data.tar.gz: 716f19553e8f15afae93d099f4e5ec81927d9f7a69f134fc92e97e83aa428bc30ccf7947fa59727db6a0c142de576823ecdda4c022352f8e726bf1bc97f99458

data/CHANGELOG.md

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

@@ -44,6 +44,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 +53,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 +72,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 +81,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 +107,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 +118,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.13"
 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.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