active_record_shards 3.11.0 → 3.11.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b2e0335664e4c146e1d5270e519fd102eda815fa
-  data.tar.gz: 074003c3628875cf9e94cb8a8d1aa0f009baa9d1
+  metadata.gz: 3cbfb7e59c8d4f61eed565d7a674fb674ddf2071
+  data.tar.gz: a0cb38cbe1854083eda4a7ccf343cc06e62bb86c
 SHA512:
-  metadata.gz: 4caa2e0aeea79f006eef29d1dd6b5c80908c68f72de26c3383ed13cc85682586a5d62cd3bad0460bf969b4d8f26fadc7167f730a468bfd1c8d12bfcbeb776497
-  data.tar.gz: 5fa6b720056fab9c81c95c49e5e0ad474d85cae217910e68b1e3f5040082c6c5dd693bfd40524e6476fee75a7008847308d8940493c5422b4fd0848b26388c23
+  metadata.gz: 4bd58f711a2a3754bd44cf99df5dcd1aa465cd97b103da5ba96b527683bd725aacd594da410083d9ef5bd10845ac6281a7704373acd6d222fa29a814cd36df94
+  data.tar.gz: f7a37e019a03eb4645252b2cbcd38d3b71c318b3af27f7aecb467a1b41cf926e21b105e070f361e0a17ea2d7568d7dde3f95b69b645682de7d90e8fbc5d685d9

data/lib/active_record_shards/connection_switcher.rb

@@ -6,8 +6,13 @@ module ActiveRecordShards
     SHARD_NAMES_CONFIG_KEY = 'shard_names'.freeze
 
     def self.extended(base)
-      base.singleton_class.send(:alias_method, :columns_without_default_shard, :columns)
-      base.singleton_class.send(:alias_method, :columns, :columns_with_default_shard)
+      if ActiveRecord::VERSION::MAJOR >= 5
+        base.singleton_class.send(:alias_method, :load_schema_without_default_shard!, :load_schema!)
+        base.singleton_class.send(:alias_method, :load_schema!, :load_schema_with_default_shard!)
+      else
+        base.singleton_class.send(:alias_method, :columns_without_default_shard, :columns)
+        base.singleton_class.send(:alias_method, :columns, :columns_with_default_shard)
+      end
 
       base.singleton_class.send(:alias_method, :table_exists_without_default_shard?, :table_exists?)
       base.singleton_class.send(:alias_method, :table_exists?, :table_exists_with_default_shard?)
@@ -177,8 +182,14 @@ module ActiveRecordShards
       end
     end
 
-    def columns_with_default_shard
-      with_default_shard { columns_without_default_shard }
+    if ActiveRecord::VERSION::MAJOR >= 5
+      def load_schema_with_default_shard!
+        with_default_shard { load_schema_without_default_shard! }
+      end
+    else
+      def columns_with_default_shard
+        with_default_shard { columns_without_default_shard }
+      end
     end
 
     def table_exists_with_default_shard?

data/lib/active_record_shards/model.rb

@@ -24,11 +24,22 @@ module ActiveRecordShards
     end
 
     def on_slave_by_default?
-      base_class.instance_variable_get(:@on_slave_by_default)
+      if self == ActiveRecord::Base
+        false
+      else
+        base = base_class
+        if base.instance_variable_defined?(:@on_slave_by_default)
+          base.instance_variable_get(:@on_slave_by_default)
+        end
+      end
     end
 
     def on_slave_by_default=(value)
-      base_class.instance_variable_set(:@on_slave_by_default, value)
+      if self == ActiveRecord::Base
+        raise ArgumentError, "Cannot set on_slave_by_default on ActiveRecord::Base"
+      else
+        base_class.instance_variable_set(:@on_slave_by_default, value)
+      end
     end
 
     module InstanceMethods

data/lib/active_record_shards/sql_comments.rb

@@ -10,7 +10,7 @@ module ActiveRecordShards
     end
 
     def self.enable
-      ActiveRecord::Base.connection.class.prepend(Methods)
+      ActiveRecord::Base.on_shard(nil) { 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.11.0
+  version: 3.11.1
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-05 00:00:00.000000000 Z
+date: 2017-09-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -229,7 +229,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.13
 signing_key: 
 specification_version: 4
 summary: Simple database switching for ActiveRecord.