switchman 1.9.9 → 1.9.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 09324e1b1e1fcd309435237928b346a70ddb9f8f
-  data.tar.gz: 22ba223386b76f2db5050e6945bc5d10e08fd214
+  metadata.gz: 0c35d2245d3da6dcc3684f329bec545e30a722fc
+  data.tar.gz: 0cdf83ae2ff27aa3d2591d99996cce15fd42ef12
 SHA512:
-  metadata.gz: bf742c8bc094cc536f8cdfc2893f033d6a476bd51e16e1c556c996f3f0fbc0517ee884b4fef81cbb00e5c5692b45b481eccf6f3b2335fe1a631d224b95db7191
-  data.tar.gz: 96887f3a05ace152c42682f9c7b2dc64f426ee622d8cb63c8a6db82f5d17b110cbd9a2a260e1a65d53ef2a5bf3bd3fee20b21781705fa9e4bceb9a78284873a9
+  metadata.gz: 73897cada38b50274a7c8ba0ee54b52f9fd43e77472ff6ade73dbd7a122c6ffadc06787546cff8b4905549aab08e3c0ccf9607c6c48bc6fd55eb07427874f6c5
+  data.tar.gz: cbea8fa73620127f37b97c115c6e25e27856766be69e45659147ebdf4e9fedccb75fd366a4322777a02d90698f9a2445e4139597469ca3de98c419f875abac37

data/app/models/switchman/shard_internal.rb

@@ -26,6 +26,7 @@ module Switchman
     validates_uniqueness_of :default, :if => lambda { |s| s.default? }
 
     after_save :clear_cache
+    after_destroy :clear_cache
 
     scope :primary, -> { where(name: nil).order(:database_server_id, :id).distinct_on(:database_server_id) }
 

data/lib/switchman/active_record/association.rb

@@ -169,6 +169,12 @@ module Switchman
     end
 
     module CollectionProxy
+      def initialize(*args)
+        super
+        self.shard_value = scope.shard_value
+        self.shard_source_value = :association
+      end
+
       def shard(*args)
         scope.shard(*args)
       end

data/lib/switchman/active_record/migration.rb

@@ -9,5 +9,12 @@ module Switchman
         conn
       end
     end
+
+    module Migrator
+      def generate_migrator_advisory_lock_id
+        shard_name_hash = Zlib.crc32(Shard.current.name)
+        ::ActiveRecord::Migrator::MIGRATOR_SALT * shard_name_hash
+      end
+    end
   end
 end

data/lib/switchman/active_record/query_methods.rb

@@ -156,6 +156,8 @@ module Switchman
       end
 
       def infer_shards_from_primary_key(predicates, binds = nil)
+        return unless klass.integral_id?
+
         primary_key = predicates.detect do |predicate|
           predicate.is_a?(::Arel::Nodes::Binary) && predicate.left.is_a?(::Arel::Attributes::Attribute) &&
             predicate.left.relation.is_a?(::Arel::Table) && predicate.left.relation.model == klass &&

data/lib/switchman/engine.rb

@@ -111,7 +111,7 @@ module Switchman
 
         ::ActiveRecord::Associations::Association.prepend(ActiveRecord::Association)
         ::ActiveRecord::Associations::BelongsToAssociation.prepend(ActiveRecord::BelongsToAssociation)
-        ::ActiveRecord::Associations::CollectionProxy.include(ActiveRecord::CollectionProxy)
+        ::ActiveRecord::Associations::CollectionProxy.prepend(ActiveRecord::CollectionProxy)
         if ::Rails.version < '5'
           ::ActiveRecord::Associations::Builder::CollectionAssociation.include(ActiveRecord::Builder::CollectionAssociation)
         end
@@ -129,6 +129,7 @@ module Switchman
 
         ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
         ::ActiveRecord::Migration.prepend(ActiveRecord::Migration)
+        ::ActiveRecord::Migrator.prepend(ActiveRecord::Migrator)
 
         ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)
         ::ActiveRecord::Reflection::AssociationReflection.prepend(ActiveRecord::Reflection::AssociationScopeCache)

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.9"
+  VERSION = "1.9.10"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.9
+  version: 1.9.10
 platform: ruby
 authors:
 - Cody Cutrer
@@ -10,7 +10,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-17 00:00:00.000000000 Z
+date: 2017-06-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: railties
@@ -177,7 +177,6 @@ files:
 - db/migrate/20130328212039_create_switchman_shards.rb
 - db/migrate/20130328224244_create_default_shard.rb
 - db/migrate/20161206323434_add_back_default_string_limits_switchman.rb
-- db/shard_1708.sqlite3
 - lib/switchman.rb
 - lib/switchman/action_controller/caching.rb
 - lib/switchman/active_record/abstract_adapter.rb
@@ -244,7 +243,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Rails 4 sharding magic