rails-pg-adapter 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: b13533de6e67440feaaee7799c583984672793b16b10aee60ca89091cadef545
-  data.tar.gz: e6927d01f1604871d426d8fa894dc400ac3626191c151b034b12771ee68b91ac
+  metadata.gz: 17e38c0c8aeb60de1697257595dd0123a262d7e6a10a996de13086e826da96a7
+  data.tar.gz: 2bb519b103a9027848ae3ca963efc66f57d47b2b34be969657035c7a4f35256b
 SHA512:
-  metadata.gz: d60b542abec512d9f5d1567f65d4327e3bc299d8ac740616fbec5aeb394f612698db6c74f5a462640cd96bdb1fb7013ff433f28780ef5cb5c3c0157ca0fa10b4
-  data.tar.gz: 16bbac80afd152b275c451243331318be772c88b9dcce2ddb1eb30be5875556f489b476b55e3b34ec618e6047a00405ca6d9caa73729d83d480101c1849a0ec8
+  metadata.gz: f65dba534475afa8db2028ec685822c86d2c80df01ef29b99212440d032b797c3a99cad2150d4276802df26fed34e45fd0810f9051f4e4ce57e4d657898aebd2
+  data.tar.gz: 80c9d7257edfefc0f452930cc84f864056df43b1cfea3c2705397411e297c6dce02fa4d43ae55bc0a188a49d778514caa9df6341e36154408a243376880040d1

data/lib/rails_pg_adapter/patch.rb

@@ -20,16 +20,33 @@ module RailsPgAdapter
     CONNECTION_SCHEMA_ERROR = ["PG::UndefinedColumn"].freeze
     CONNECTION_SCHEMA_RE = /#{CONNECTION_SCHEMA_ERROR.map { |w| Regexp.escape(w) }.join("|")}/.freeze
 
+    class << self
+      def supported_errors?(e)
+        return true if failover_error?(e.message)
+        return true if missing_column_error?(e.message)
+        false
+      end
+
+      def failover_error?(error_message)
+        CONNECTION_ERROR_RE.match?(error_message) && ::RailsPgAdapter.failover_patch?
+      end
+
+      def missing_column_error?(error_message)
+        CONNECTION_SCHEMA_RE.match?(error_message) &&
+          ::RailsPgAdapter.reset_column_information_patch?
+      end
+    end
+
     private
 
     def exec_cache(*args)
-      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
-        raise unless supported_errors?(e)
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
 
         if try_reconnect?(e)
           sleep_time = sleep_times.shift
@@ -44,13 +61,13 @@ module RailsPgAdapter
     end
 
     def exec_no_cache(*args)
-      sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+      sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
       begin
         super(*args)
       rescue ::ActiveRecord::StatementInvalid,
              ::ActiveRecord::ConnectionNotEstablished,
              ::ActiveRecord::NoDatabaseError => e
-        raise unless supported_errors?(e)
+        raise unless ::RailsPgAdapter::Patch.supported_errors?(e)
 
         if try_reconnect?(e)
           sleep_time = sleep_times.shift
@@ -66,8 +83,8 @@ module RailsPgAdapter
 
     def try_reconnect?(e)
       return false if in_transaction?
-      return false unless failover_error?(e.message)
-      return false unless RailsPgAdapter.reconnect_with_backoff?
+      return false unless ::RailsPgAdapter::Patch.failover_error?(e.message)
+      return false unless ::RailsPgAdapter.reconnect_with_backoff?
 
       begin
         disconnect_conn!
@@ -78,15 +95,13 @@ module RailsPgAdapter
     end
 
     def handle_error(e)
-      if failover_error?(e.message) && RailsPgAdapter.failover_patch?
+      if ::RailsPgAdapter::Patch.failover_error?(e.message)
         warn("clearing connections due to #{e} - #{e.message}")
         disconnect_conn!
         raise(e)
       end
 
-      unless missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
-        return
-      end
+      return unless ::RailsPgAdapter::Patch.missing_column_error?(e.message)
 
       warn("clearing column information due to #{e} - #{e.message}")
 
@@ -94,14 +109,6 @@ module RailsPgAdapter
       raise
     end
 
-    def failover_error?(error_message)
-      CONNECTION_ERROR_RE.match?(error_message)
-    end
-
-    def missing_column_error?(error_message)
-      CONNECTION_SCHEMA_RE.match?(error_message)
-    end
-
     def disconnect_conn!
       disconnect!
       ::ActiveRecord::Base.connection_pool.remove(::ActiveRecord::Base.connection)
@@ -115,15 +122,7 @@ module RailsPgAdapter
     def warn(msg)
       return unless defined?(Rails)
       return if Rails.logger.nil?
-      ::Rails.logger.warn("[RailsPgAdapter::Patch] #{msg}")
-    end
-
-    def supported_errors?(e)
-      return true if failover_error?(e.message) && RailsPgAdapter.failover_patch?
-      if missing_column_error?(e.message) && RailsPgAdapter.reset_column_information_patch?
-        return true
-      end
-      false
+      ::Rails.logger.warn("[::RailsPgAdapter::Patch] #{msg}")
     end
   end
 end
@@ -138,15 +137,20 @@ module ActiveRecord
         old_new_client_method = instance_method(:new_client)
 
         define_method(:new_client) do |args|
-          sleep_times = RailsPgAdapter.configuration.reconnect_with_backoff.dup
+          sleep_times = ::RailsPgAdapter.configuration.reconnect_with_backoff.dup
           begin
             old_new_client_method.bind(self).call(args)
           rescue ::ActiveRecord::ConnectionNotEstablished, ::ActiveRecord::NoDatabaseError => e
-            raise(e) unless RailsPgAdapter.failover_patch? && RailsPgAdapter.reconnect_with_backoff?
+            unless ::RailsPgAdapter::Patch.supported_errors?(e) &&
+                     ::RailsPgAdapter.reconnect_with_backoff?
+              raise
+            end
 
             sleep_time = sleep_times.shift
             raise unless sleep_time
-            warn("Could not establish a connection from new_client, retrying again in #{sleep_time} sec.")
+            warn(
+              "Could not establish a connection from new_client, retrying again in #{sleep_time} sec.",
+            )
             sleep(sleep_time)
             retry
           end

data/lib/rails_pg_adapter/version.rb

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

metadata

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