Merge branch 'master' into avoid_connecting_to_primary_in_on_replica

Author: sgringwe

CHANGELOG.md

@@ -1,4 +1,5 @@
 ## Unreleased
 
+- Allow setting `Knockoff.default_target` to set the default target other than `:primary` (https://github.com/joinhandshake/knockoff/pull/11)
 - Drop Ruby 2.2 support
 - Add Ruby 2.5 support

lib/knockoff.rb

@@ -10,6 +10,7 @@
 module Knockoff
   class << self
     attr_accessor :enabled
+    attr_reader :default_target
 
     def on_replica(check_transaction: true, &block)
       Base.new(:replica, check_transaction: check_transaction).run(&block)
@@ -19,6 +20,10 @@ def on_primary(&block)
       Base.new(:primary).run(&block)
     end
 
+    def default_target=(target)
+      @default_target = Base.new(target).target
+    end
+
     def replica_pool
       @replica_pool ||= ReplicaConnectionPool.new(config.replica_database_keys)
     end

lib/knockoff/active_record/base.rb

@@ -4,7 +4,8 @@ class << self
       alias_method :original_connection, :connection
 
       def connection
-        case Thread.current[:knockoff]
+        target = Thread.current[:knockoff] || Knockoff.default_target
+        case target
         when :replica
           # Attempts to use a random replica connection, but otherwise falls back to primary
           Knockoff.replica_pool.random_replica_connection.original_connection

lib/knockoff/base.rb

@@ -1,5 +1,7 @@
 module Knockoff
   class Base
+    attr_reader :target
+
     def initialize(target, check_transaction: true)
       @target = decide_with(target, check_transaction)
     end

spec/knockoff_spec.rb

@@ -61,6 +61,30 @@ def on_replica?
       end
     end
 
+    context 'allows for setting the default target' do
+      after(:each) { Knockoff.instance_variable_set("@default_target", nil) }
+
+      it 'sets the target' do
+        expect(Knockoff.default_target).to be nil
+        Knockoff.default_target = :replica
+        expect(Knockoff.default_target).to eq :replica
+        Knockoff.on_primary { expect(on_replica?).to be false }
+        expect(Knockoff.default_target).to eq :replica
+        Knockoff.default_target = :primary
+        expect(Knockoff.default_target).to eq :primary
+      end
+
+      it 'returns the correct connection' do
+        expect(ActiveRecord::Base.connection).to eq ActiveRecord::Base.original_connection
+        Knockoff.default_target = :replica
+        expect(ActiveRecord::Base.connection).to eq Knockoff::KnockoffReplica0.connection
+        Knockoff.on_primary { expect(ActiveRecord::Base.connection).to eq ActiveRecord::Base.original_connection }
+        expect(ActiveRecord::Base.connection).to_not eq ActiveRecord::Base.original_connection
+        Knockoff.default_target = :primary
+        expect(ActiveRecord::Base.connection).to eq ActiveRecord::Base.original_connection
+      end
+    end
+
     context 'in transaction' do
       it 'raises error in transaction if replica is attempted' do
         User.transaction do