Implement current_shard_dirty and fix 454

lib/octopus/proxy.rb

@@ -8,6 +8,7 @@ class Proxy
 
     delegate :current_model, :current_model=,
              :current_shard, :current_shard=,
+             :current_shard_dirty, :current_shard_dirty=,
              :current_group, :current_group=,
              :current_slave_group, :current_slave_group=,
              :current_load_balance_options, :current_load_balance_options=,
@@ -269,7 +270,7 @@ def should_clean_connection_proxy?(method)
 
     # Try to use slaves if and only if `replicated: true` is specified in `shards.yml` and no slaves groups are defined
     def should_send_queries_to_replicated_databases?(method)
-      replicated && method.to_s =~ /select/ && !block && !slaves_grouped?
+      replicated && method.to_s =~ /select/ && (!block || !current_shard_dirty) && !slaves_grouped?
     end
 
     def send_queries_to_selected_slave(method, *args, &block)

lib/octopus/proxy_config.rb

@@ -2,6 +2,7 @@ module Octopus
   class ProxyConfig
     CURRENT_MODEL_KEY = 'octopus.current_model'.freeze
     CURRENT_SHARD_KEY = 'octopus.current_shard'.freeze
+    CURRENT_SHARD_DIRTY_KEY = 'octopus.current_shard_dirty'.freeze
     CURRENT_GROUP_KEY = 'octopus.current_group'.freeze
     CURRENT_SLAVE_GROUP_KEY = 'octopus.current_slave_group'.freeze
     CURRENT_LOAD_BALANCE_OPTIONS_KEY = 'octopus.current_load_balance_options'.freeze
@@ -25,6 +26,14 @@ def current_model=(model)
       Thread.current[CURRENT_MODEL_KEY] = model.is_a?(ActiveRecord::Base) ? model.class : model
     end
 
+    def current_shard_dirty
+      Thread.current[CURRENT_SHARD_DIRTY_KEY] ||= false
+    end
+
+    def current_shard_dirty=(value)
+      Thread.current[CURRENT_SHARD_DIRTY_KEY] = value
+    end
+
     def current_shard
       Thread.current[CURRENT_SHARD_KEY] ||= Octopus.master_shard
     end

lib/octopus/scope_proxy.rb

@@ -37,6 +37,7 @@ def connection
       if @klass.custom_octopus_connection && @klass.allowed_shard?(@current_shard)
         # Force use of proxy, given we called 'using' explicitly to get here
         @klass.connection_proxy.current_model = @klass
+        @klass.connection_proxy.current_shard_dirty = true
         @klass.connection_proxy
       else
         @klass.connection