active_record_shards 3.3.0 → 3.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 43206276f47aa0561bb451661c886c939e98c2c4
-  data.tar.gz: 31f9ef77505853ea2cbd76d77f45b0b01055e513
+  metadata.gz: 5523197a8500c9479196fe307498dd2f8ccfbef2
+  data.tar.gz: 5d70fe07412aa283dee579008f34174fbbf7e582
 SHA512:
-  metadata.gz: 7d9302160f33ee42e2b245aff4dd904ea0f9d47746083179be4e8e631adca5707cb157c44288ebf94701ae535f5d89daaf322b2efb9216a92d622124fbb6ca1f
-  data.tar.gz: c74e7c3539595f516762e85a284d5026e82888442b5f13a4d759bb295fcec92553250235ea43775aff1279aa8a688b27aced36e1f9618bfaa12ff9c6cc322feb
+  metadata.gz: 4d679078d284eec8e16e670c7425e0291319f8a608e84b8a93b3e0cecfd0db984bdce655092121fafaabf67c1d720d8ef99c4ae1205eaf7efc056c161b802855
+  data.tar.gz: 30070b0b63f03a7f4500a5368f33de1ef5a22335539b11dbf5c5d7a00e1896811cbe78793b1df9466ff9580fd5dab9eb253bac5d796cab6f7ed73a5d896f2a51

data/README.md

@@ -1,9 +1,9 @@
 # ActiveRecord Shards
 
 ActiveRecord Shards is an extension for ActiveRecord that provides support for sharded database and slaves. Basically it is just a nice way to
-switch between database connection. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
+switch between database connections. We've made the implementation very small, and have tried not to reinvent any wheels already present in ActiveRecord.
 
-ActiveRecord Shards has used and tested on Rails 2.3.x, 3.0.x, and 3.2.x and has in some form or another been used on in production on a large rails app for
+ActiveRecord Shards has used and tested on Rails 3.0.x, 3.2.x, and 4.1.x and has in some form or another been used in production on a large rails app for
 more than a year.
 
 ## Installation
@@ -38,7 +38,7 @@ Add the slave and shard configuration to config/database.yml:
           slave:
             host: db_shard2_slave
 
-basically connections inherit configuration from the parent the configuration file.
+basically connections inherit configuration from the parent configuration file.
 
 ## Usage
 

data/lib/active_record_shards/default_slave_patches.rb

@@ -124,6 +124,9 @@ module ActiveRecordShards
         def model.on_slave_by_default?
           left_reflection.klass.on_slave_by_default?
         end
+
+        # also transfer the sharded-ness of the left table to the join model
+        model.not_sharded if !model.left_reflection.klass.is_sharded?
         model
       end
     end

data/lib/active_record_shards/tasks.rb

@@ -46,7 +46,11 @@ namespace :db do
   desc "Raises an error if there are pending migrations"
   task :abort_if_pending_migrations => :environment do
     if defined? ActiveRecord
-      pending_migrations = ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
+      if Rails::VERSION::MAJOR >= 4
+        pending_migrations = ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.open(ActiveRecord::Migrator.migrations_paths).pending_migrations }
+      else
+        pending_migrations = ActiveRecord::Base.on_shard(nil) { ActiveRecord::Migrator.new(:up, 'db/migrate').pending_migrations }
+      end
 
       if pending_migrations.any?
         puts "You have #{pending_migrations.size} pending migrations:"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_shards
 version: !ruby/object:Gem::Version
-  version: 3.3.0
+  version: 3.3.2
 platform: ruby
 authors:
 - Mick Staugaard
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-01-06 00:00:00.000000000 Z
+date: 2015-01-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord