active_record_proxy_adapters 0.7.0 → 0.7.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: eaa34c675630f13046dbc7170773fca75998eecef0b6e4990ce53110bdfdecef
-  data.tar.gz: 92c024345625535b4f3bfcb241b898e3a26c09836a5f3c6dac61749c913aef85
+  metadata.gz: 5942f8ab80752d3abe9ac1015a991cc8bb8cbe7faa3961824e617ec478fd1cf0
+  data.tar.gz: daaf2fb00ad05b38c0477bb14d5a8f02d405863fd592252c63a887964385cc2f
 SHA512:
-  metadata.gz: 76493c2922eb8f725410bc69223b9bc9dd121cece620e188a73b941ea7b8ef549108ffea8d3c1c38ddee2ed5686b6160284f87665ea431e41f4a32bccc80472a
-  data.tar.gz: 24c3cf701b469e364a5206ace80d3e8a609fddcd1839337069f0b0f7bbbf27f6c35940d7642a5f717b6030bf776afa988912fb8306b0e8b5d4d2e7fe5bde0ff4
+  metadata.gz: 2f61e7d36e3d968c9cf4f873f3cc7d70c5a1054337aa0b773ad59d76ad52b33088dc2c4588cf996725a7fa2efda42de77888654db6b3e53a93026a06dced44e4
+  data.tar.gz: 022acae0581a7910927a18a7452750e9628b238cc590b05e3b3bf15c0b3d4f8b163fbcc7fcc30071f3673dc7d1c6cd33fa01c2bd1c88d0c1e5611de6f77c060f

data/README.md

@@ -6,7 +6,7 @@ A set of ActiveRecord adapters that leverage Rails native multiple database setu
 
 ## Why do I need this?
 
-Maybe you don't. Rails already provides, since version 6.0, a [Rack middleware](https://guides.rubyonrails.org/active_record_multiple_databases.html#activating-automatic-role-switching) that switches between primary and replica automatically based on the HTTP request (`GET` and `HEAD` requests go the primary, everything else goes to the replica).
+Maybe you don't. Rails already provides, since version 6.0, a [Rack middleware](https://guides.rubyonrails.org/active_record_multiple_databases.html#activating-automatic-role-switching) that switches between primary and replica automatically based on the HTTP request (`GET` and `HEAD` requests go the replica, everything else goes to the primary).
 
 The caveat is: you are not allowed do any writes in any `GET` or `HEAD` requests (including controller callbacks).
 Which means, for example, your `devise` callbacks that save user metadata will now crash.

data/lib/active_record_proxy_adapters/configuration.rb

@@ -11,7 +11,8 @@ module ActiveRecordProxyAdapters
   class Configuration
     include SynchronizableConfiguration
 
-    DEFAULT_DATABASE_NAME = :primary
+    DEFAULT_DATABASE_NAME         = :primary
+    DEFAULT_REPLICA_DATABASE_NAME = :primary_replica
 
     # @return [Class] The context that is used to store the current request's state.
     attr_reader :context_store
@@ -25,19 +26,19 @@ module ActiveRecordProxyAdapters
     end
 
     def log_subscriber_primary_prefix=(prefix)
-      default_database_config.log_subscriber_primary_prefix = prefix
+      default_database_config.log_subscriber_prefix = prefix
     end
 
     def log_subscriber_primary_prefix
-      default_database_config.log_subscriber_primary_prefix
+      default_database_config.log_subscriber_prefix
     end
 
     def log_subscriber_replica_prefix=(prefix)
-      default_database_config.log_subscriber_replica_prefix = prefix
+      default_replica_config.log_subscriber_prefix = prefix
     end
 
     def log_subscriber_replica_prefix
-      default_database_config.log_subscriber_replica_prefix
+      default_replica_config.log_subscriber_prefix
     end
 
     def proxy_delay
@@ -75,6 +76,10 @@ module ActiveRecordProxyAdapters
       database(DEFAULT_DATABASE_NAME)
     end
 
+    def default_replica_config
+      database(DEFAULT_REPLICA_DATABASE_NAME)
+    end
+
     def cache_configuration=(cache_configuration)
       synchronize_update(:cache_configuration, from: @cache_configuration, to: cache_configuration) do
         @cache_configuration = cache_configuration

data/lib/active_record_proxy_adapters/database_configuration.rb

@@ -25,18 +25,14 @@ module ActiveRecordProxyAdapters
     #   Defaults to CHECKOUT_TIMEOUT. Thread safe.
     attr_reader :checkout_timeout
 
-    # @return [Proc] Prefix for the log subscriber when the primary database is used. Thread safe.
-    attr_reader :log_subscriber_primary_prefix
-
-    # @return [Proc] Prefix for the log subscriber when the replica database is used. Thread safe.
-    attr_reader :log_subscriber_replica_prefix
+    # @return [Proc] Prefix for the log subscriber when the database is used. Thread safe.
+    attr_reader :log_subscriber_prefix
 
     def initialize
-      @lock                              = Monitor.new
-      self.proxy_delay                   = PROXY_DELAY
-      self.checkout_timeout              = CHECKOUT_TIMEOUT
-      self.log_subscriber_primary_prefix = DEFAULT_PREFIX
-      self.log_subscriber_replica_prefix = DEFAULT_PREFIX
+      @lock                      = Monitor.new
+      self.proxy_delay           = PROXY_DELAY
+      self.checkout_timeout      = CHECKOUT_TIMEOUT
+      self.log_subscriber_prefix = DEFAULT_PREFIX
     end
 
     def proxy_delay=(proxy_delay)
@@ -51,19 +47,11 @@ module ActiveRecordProxyAdapters
       end
     end
 
-    def log_subscriber_primary_prefix=(prefix)
-      prefix_proc = prefix.is_a?(Proc) ? prefix : proc { prefix.to_s }
-
-      synchronize_update(:log_subscriber_primary_prefix, from: @log_subscriber_primary_prefix, to: prefix_proc) do
-        @log_subscriber_primary_prefix = prefix_proc
-      end
-    end
-
-    def log_subscriber_replica_prefix=(prefix)
+    def log_subscriber_prefix=(prefix)
       prefix_proc = prefix.is_a?(Proc) ? prefix : proc { prefix.to_s }
 
-      synchronize_update(:log_subscriber_replica_prefix, from: @log_subscriber_replica_prefix, to: prefix_proc) do
-        @log_subscriber_replica_prefix = prefix_proc
+      synchronize_update(:log_subscriber_prefix, from: @log_subscriber_prefix, to: prefix_proc) do
+        @log_subscriber_prefix = prefix_proc
       end
     end
 

data/lib/active_record_proxy_adapters/log_subscriber.rb

@@ -25,11 +25,7 @@ module ActiveRecordProxyAdapters
       db_config       = connection.pool.try(:db_config) || NullConfig.new # AR 7.0.x does not support "NullConfig"
       connection_name = db_config.name
 
-      prefix = if db_config.replica?
-                 log_subscriber_replica_prefix(connection_name)
-               else
-                 log_subscriber_primary_prefix(connection_name)
-               end
+      prefix = log_subscriber_prefix(connection_name)
 
       "[#{prefix.call(event)}]"
     end

data/lib/active_record_proxy_adapters/mixin/configuration.rb

@@ -10,19 +10,11 @@ module ActiveRecordProxyAdapters
     # Provides helpers to access to reduce boilerplate while retrieving configuration properties.
     module Configuration
       # Helper to retrieve the proxy delay from the configuration stored in
-      # {ActiveRecordProxyAdapters::DatabaseConfiguration#log_subscriber_primary_prefix}.
+      # {ActiveRecordProxyAdapters::DatabaseConfiguration#log_subscriber_prefix}.
       # @param database_name [Symbol, String] The name of the database to retrieve the prefix.
       # @return [Proc]
-      def log_subscriber_primary_prefix(database_name)
-        database_config(database_name).log_subscriber_primary_prefix
-      end
-
-      # Helper to retrieve the proxy delay from the configuration stored in
-      # {ActiveRecordProxyAdapters::DatabaseConfiguration#log_subscriber_replica_prefix}.
-      # @param database_name [Symbol, String] The name of the database to retrieve the prefix.
-      # @return [Proc]
-      def log_subscriber_replica_prefix(database_name)
-        database_config(database_name).log_subscriber_replica_prefix
+      def log_subscriber_prefix(database_name)
+        database_config(database_name).log_subscriber_prefix
       end
 
       # Helper to retrieve the proxy delay from the configuration stored in

data/lib/active_record_proxy_adapters/primary_replica_proxy.rb

@@ -35,13 +35,13 @@ module ActiveRecordProxyAdapters
     # These patterns define which database statments are considered write statments, so we can shortly re-route all
     # requests to the primary database so the replica has time to replicate
     WRITE_STATEMENT_MATCHERS = [
-      /\ABEGIN/i,
-      /\ACOMMIT/i,
-      /\AROLLBACK/i,
-      /INSERT\s[\s\S]*INTO\s[\s\S]*/i,
-      /UPDATE\s[\s\S]*/i,
-      /DELETE\s[\s\S]*FROM\s[\s\S]*/i,
-      /DROP\s/i
+      /(\A|\s+?)BEGIN/i,
+      /(\A|\s+?)COMMIT/i,
+      /(\A|\s+?)ROLLBACK/i,
+      /(\A|\s+?)(INSERT\s+?INTO\s+?\S+?)/i,
+      /(\A|\s+?)UPDATE\s+?\S+?/i,
+      /(\A|\s+?)DELETE\s+?FROM\s+?\S+?/i,
+      /(\A|\s+?)DROP\s/i
     ].map(&:freeze).freeze
 
     # Abstract adapter methods that should be proxied.

data/lib/active_record_proxy_adapters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordProxyAdapters
-  VERSION = "0.7.0"
+  VERSION = "0.7.2"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_proxy_adapters
 version: !ruby/object:Gem::Version
-  version: 0.7.0
+  version: 0.7.2
 platform: ruby
 authors:
 - Matt Cruz