active_record_shards 3.10.0 → 3.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4910854dd97e92f0aab3a997b23c4f830d98e66f
-  data.tar.gz: df78f89f7245ab25bd3ca40c06990ceb929b66f9
+  metadata.gz: b2e0335664e4c146e1d5270e519fd102eda815fa
+  data.tar.gz: 074003c3628875cf9e94cb8a8d1aa0f009baa9d1
 SHA512:
-  metadata.gz: b25b5bd49ed22d0ca64d951b4384533711c0ee6451bd881fd6756786f97b3747ed10392756b1161460a0dc54f44a68c06847cb62f7e1387f568402405227411e
-  data.tar.gz: e29b7d4237ed37008edc25450b75bc620c3f10f50855ce7403334098be94b91a127297969c9bd4d6415f3ba106d626d9252fe39fc9ce94452a4e774b9d6a3e5c
+  metadata.gz: 4caa2e0aeea79f006eef29d1dd6b5c80908c68f72de26c3383ed13cc85682586a5d62cd3bad0460bf969b4d8f26fadc7167f730a468bfd1c8d12bfcbeb776497
+  data.tar.gz: 5fa6b720056fab9c81c95c49e5e0ad474d85cae217910e68b1e3f5040082c6c5dd693bfd40524e6476fee75a7008847308d8940493c5422b4fd0848b26388c23

data/README.md

@@ -91,6 +91,15 @@ This will perform the query on the slave, and mark the returned instances as rea
 
     Account.on_slave.find_by_big_expensive_query
 
+## Debugging
+
+Show if a query went to master or slave in the logs:
+
+```Ruby
+require 'active_record_shards/sql_comments'
+ActiveRecordShards::SqlComments.enable
+```
+
 ## Copyright
 
 Copyright (c) 2011 Zendesk. See LICENSE for details.

data/lib/active_record_shards/model.rb

@@ -24,13 +24,11 @@ module ActiveRecordShards
     end
 
     def on_slave_by_default?
-      if self == ActiveRecord::Base
-        false
-      elsif self == base_class
-        on_slave_by_default
-      else
-        base_class.on_slave_by_default?
-      end
+      base_class.instance_variable_get(:@on_slave_by_default)
+    end
+
+    def on_slave_by_default=(value)
+      base_class.instance_variable_set(:@on_slave_by_default, value)
     end
 
     module InstanceMethods
@@ -53,11 +51,8 @@ module ActiveRecordShards
       base.after_initialize :initialize_shard_and_slave
     end
 
-    attr_writer :on_slave_by_default
-
     private
 
-    attr_reader :on_slave_by_default
     attr_accessor :sharded
   end
 end

data/lib/active_record_shards/sql_comments.rb

@@ -0,0 +1,16 @@
+# show which connection was picked to debug master/slave slowness when both servers are the same
+module ActiveRecordShards
+  module SqlComments
+    module Methods
+      def execute(query, name = nil)
+        slave = ActiveRecord::Base.current_shard_selection.on_slave?
+        query += " /* #{slave ? 'slave' : 'master'} */"
+        super(query, name)
+      end
+    end
+
+    def self.enable
+      ActiveRecord::Base.connection.class.prepend(Methods)
+    end
+  end
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.10.0
+  version: 3.11.0
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-04 00:00:00.000000000 Z
+date: 2017-09-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -207,6 +207,7 @@ files:
 - lib/active_record_shards/schema_dumper_extension.rb
 - lib/active_record_shards/shard_selection.rb
 - lib/active_record_shards/shard_support.rb
+- lib/active_record_shards/sql_comments.rb
 - lib/active_record_shards/tasks.rb
 homepage: https://github.com/zendesk/active_record_shards
 licenses: