switchman 1.9.14 → 1.10.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6b3272200e4d6343d49dec5aab8667e19b556e85
-  data.tar.gz: 60fd7a0ea2885cf4826cda7092f74acf68293f2b
+  metadata.gz: d9bf082be6cc36e99b6be46bdf90c47102c45962
+  data.tar.gz: 105fd5544f11577cd939de766a0d2950f727759e
 SHA512:
-  metadata.gz: 867dfb29be7c90e90e0ddf9b0e7b267c6a19977912d5fb028c2dd8fccdd921a1a999160507d5962f55023584c32e329626d92d0185f8c3ed199c740ed4c1c385
-  data.tar.gz: 34e2b33034ce3a7090c27deb3c2dd709c77dad8796406eeaf47e5cf927b863894278ec010d6422d0d95956d4bc9502405cddf3d50b90caae88b28b7b7db3914d
+  metadata.gz: 3a69a13d8922e15c57a972c4521833f0d1658d7c13198f766e1cc2374a3cc8781765984194bb1b57950b32bc2c52221b3aeb8d1e6474e30bde3a4aa30a6d8cd3
+  data.tar.gz: a22298dbbc075b8a69af90bd87c97a74ad598729551f268a7bd3bb9eae08aa28eec6ca1654bf35b2b7863527acd2aab63458a8ad439453d4d86fb5514c0d7447

data/app/models/switchman/shard_internal.rb

@@ -192,7 +192,7 @@ module Switchman
           max_procs = determine_max_procs(options.delete(:max_procs), parallel)
           if ::ActiveRecord::Relation === scope
             # still need a post-uniq, cause the default database server could be NULL or Rails.env in the db
-            database_servers = scope.reorder('database_server_id').select(:database_server_id).uniq.
+            database_servers = scope.reorder('database_server_id').select(:database_server_id).distinct.
                 map(&:database_server).compact.uniq
             parallel = [(max_procs.to_f / database_servers.count).ceil, parallel].min if max_procs
 

data/db/migrate/20130328212039_create_switchman_shards.rb

@@ -1,4 +1,4 @@
-class CreateSwitchmanShards < ActiveRecord::Migration
+class CreateSwitchmanShards < ActiveRecord::Migration[4.2]
   def change
     create_table :switchman_shards do |t|
       t.string :name

data/db/migrate/20130328224244_create_default_shard.rb

@@ -1,4 +1,4 @@
-class CreateDefaultShard < ActiveRecord::Migration
+class CreateDefaultShard < ActiveRecord::Migration[4.2]
   def up
     unless Switchman::Shard.default.is_a?(Switchman::Shard)
       Switchman::Shard.reset_column_information

data/db/migrate/20161206323434_add_back_default_string_limits_switchman.rb

@@ -1,4 +1,4 @@
-class AddBackDefaultStringLimitsSwitchman < ActiveRecord::Migration
+class AddBackDefaultStringLimitsSwitchman < ActiveRecord::Migration[4.2]
   def up
     add_string_limit_if_missing :switchman_shards, :name
     add_string_limit_if_missing :switchman_shards, :database_server_id

data/lib/switchman/active_record/abstract_adapter.rb

@@ -38,6 +38,14 @@ module Switchman
       ensure
         @last_query_at = Time.now
       end
+
+      private
+
+      def id_value_for_database(value)
+        return super unless value.class.sharded_primary_key?
+        # do this the Rails 4.2 way, so that if Shard.current != self.shard, the id gets transposed
+        quote(value.id)
+      end
     end
   end
 end

data/lib/switchman/active_record/association.rb

@@ -36,14 +36,17 @@ module Switchman
     end
 
     module CollectionAssociation
-      def get_records
-        shards = reflection.options[:multishard] && owner.respond_to?(:associated_shards) ? owner.associated_shards : [shard]
-        # activate both the owner and the target's shard category, so that Reflection#join_id_for,
-        # when called for the owner, will be returned relative to shard the query will execute on
-        Shard.with_each_shard(shards, [klass.shard_category, owner.class.shard_category].uniq) do
-          super
+      method = ::Rails.version < '5.1' ? :get_records : :find_target
+      module_eval <<-RUBY, __FILE__, __LINE__ + 1
+        def #{method}
+          shards = reflection.options[:multishard] && owner.respond_to?(:associated_shards) ? owner.associated_shards : [shard]
+          # activate both the owner and the target's shard category, so that Reflection#join_id_for,
+          # when called for the owner, will be returned relative to shard the query will execute on
+          Shard.with_each_shard(shards, [klass.shard_category, owner.class.shard_category].uniq) do
+            super
+          end
         end
-      end
+      RUBY
     end
 
     module BelongsToAssociation

data/lib/switchman/active_record/base.rb

@@ -138,7 +138,7 @@ module Switchman
       end
 
       def hash
-        self.class.sharded_primary_key? ? Shard.global_id_for(id).hash : super
+        self.class.sharded_primary_key? ? self.class.hash ^ Shard.global_id_for(id).hash : super
       end
 
       def to_param
@@ -156,7 +156,7 @@ module Switchman
         def quoted_id
           return super unless self.class.sharded_primary_key?
           # do this the Rails 4.2 way, so that if Shard.current != self.shard, the id gets transposed
-          self.class.connection.quote(id, column_for_attribute(self.class.primary_key))
+          self.class.connection.quote(id)
         end
       end
     end

data/lib/switchman/active_record/connection_handler.rb

@@ -40,10 +40,15 @@ module Switchman
           Shard.default
 
           # automatically change config to allow for sharing connections with simple config
-          ConnectionHandler.make_sharing_automagic(spec.config)
+          config = ::Rails.version < '5.1' ? spec.config : pool.spec.config
+          ConnectionHandler.make_sharing_automagic(config)
           ConnectionHandler.make_sharing_automagic(Shard.default.database_server.config)
 
-          ::ActiveRecord::Base.configurations[::Rails.env] = spec.instance_variable_get(:@config).stringify_keys
+          if ::Rails.version < '5.1'
+            ::ActiveRecord::Base.configurations[::Rails.env] = spec.instance_variable_get(:@config).stringify_keys
+          else
+            ::ActiveRecord::Base.configurations[::Rails.env] = config.stringify_keys
+          end
         end
 
         @shard_connection_pools ||= { [:master, Shard.default.database_server.shareable? ? ::Rails.env : Shard.default] => pool}
@@ -162,12 +167,13 @@ module Switchman
               # A connection was established in an ancestor process that must have
               # subsequently forked. We can't reuse the connection, but we can copy
               # the specification and establish a new connection with it.
-              pool = nil
-              if ancestor_pool.is_a?(ConnectionPoolProxy)
-                pool = establish_connection ancestor_pool.default_pool.spec
+              spec = if ancestor_pool.is_a?(ConnectionPoolProxy)
+                ancestor_pool.default_pool.spec
               else
-                pool = establish_connection ancestor_pool.spec
+                ancestor_pool.spec
               end
+              spec = spec.to_hash if ::Rails.version >= '5.1'
+              pool = establish_connection spec
               pool.instance_variable_set(:@schema_cache, ancestor_pool.schema_cache) if ancestor_pool.schema_cache
               pool
             elsif spec_name != "primary"

data/lib/switchman/active_record/log_subscriber.rb

@@ -21,8 +21,6 @@ module Switchman
             binds = "  " + payload[:binds].map { |col,v|
               render_bind(col, v)
             }.inspect
-          elsif ::Rails.version < '5.0.3'
-            binds = "  " + payload[:binds].map { |attr| render_bind(attr) }.inspect
           else
             casted_params = type_casted_binds(payload[:binds], payload[:type_casted_binds])
             binds = "  " + payload[:binds].zip(casted_params).map { |attr, value|

data/lib/switchman/active_record/migration.rb

@@ -1,6 +1,23 @@
 module Switchman
   module ActiveRecord
     module Migration
+      module Compatibility
+        module V5_0
+          def create_table(*args, **options)
+            unless options.key?(:id)
+              options[:id] = :bigserial
+            end
+            if block_given?
+              super do |td|
+                yield td
+              end
+            else
+              super
+            end
+          end
+        end
+      end
+
       def connection
         conn = super
         if conn.shard != ::ActiveRecord::Base.connection_pool.current_pool.shard

data/lib/switchman/active_record/postgresql_adapter.rb

@@ -1,8 +1,10 @@
 module Switchman
   module ActiveRecord
     module PostgreSQLAdapter
-      def self.prepended(klass)
-        klass::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key".freeze
+      if ::Rails.version < '5'
+        def self.prepended(klass)
+          klass::NATIVE_DATABASE_TYPES[:primary_key] = "bigserial primary key".freeze
+        end
       end
 
       # copy/paste; use quote_local_table_name
@@ -137,7 +139,7 @@ module Switchman
         end.compact
       end
 
-      def index_name_exists?(table_name, index_name, default)
+      def index_name_exists?(table_name, index_name, _default = nil)
         schema = shard.name if use_qualified_names?
 
         exec_query(<<-SQL, 'SCHEMA').rows.first[0].to_i > 0

data/lib/switchman/active_record/query_cache.rb

@@ -80,22 +80,46 @@ module Switchman
 
       private
 
-      def cache_sql(sql, binds)
-        # have to include the shard id in the cache key because of switching dbs on the same connection
-        sql = "#{self.shard.id}::#{sql}"
-        result =
-            if query_cache[sql].key?(binds)
-              ::ActiveSupport::Notifications.instrument("sql.active_record",
-                                                      :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id)
-              query_cache[sql][binds]
-            else
-              query_cache[sql][binds] = yield
-            end
+      if ::Rails.version < '5.1'
+        def cache_sql(sql, binds)
+          # have to include the shard id in the cache key because of switching dbs on the same connection
+          sql = "#{self.shard.id}::#{sql}"
+          result =
+              if query_cache[sql].key?(binds)
+                ::ActiveSupport::Notifications.instrument("sql.active_record",
+                                                        :sql => sql, :binds => binds, :name => "CACHE", :connection_id => object_id)
+                query_cache[sql][binds]
+              else
+                query_cache[sql][binds] = yield
+              end
 
-        if ::ActiveRecord::Result === result
-          result.dup
-        else
-          result.collect { |row| row.dup }
+          if ::ActiveRecord::Result === result
+            result.dup
+          else
+            result.collect { |row| row.dup }
+          end
+        end
+      else
+        def cache_sql(sql, name, binds)
+          # have to include the shard id in the cache key because of switching dbs on the same connection
+          sql = "#{self.shard.id}::#{sql}"
+          @lock.synchronize do
+            result =
+                if query_cache[sql].key?(binds)
+                  ::ActiveSupport::Notifications.instrument(
+                      "sql.active_record",
+                      sql: sql,
+                      binds: binds,
+                      name: name,
+                      connection_id: object_id,
+                      cached: true,
+                  )
+                  query_cache[sql][binds]
+                else
+                  query_cache[sql][binds] = yield
+                end
+            result.dup
+          end
         end
       end
     end

data/lib/switchman/active_record/statement_cache.rb

@@ -44,12 +44,22 @@ module Switchman
         end
       end
 
-      def generic_query_builder(connection)
-        @query_builder ||= connection.cacheable_query(@arel)
-      end
+      if ::Rails.version < '5.1'
+        def generic_query_builder(connection)
+          @query_builder ||= connection.cacheable_query(@arel)
+        end
+
+        def qualified_query_builder(shard, klass)
+          @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(@arel)
+        end
+      else
+        def generic_query_builder(connection)
+          @query_builder ||= connection.cacheable_query(self.class, @arel)
+        end
 
-      def qualified_query_builder(shard, klass)
-        @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(@arel)
+        def qualified_query_builder(shard, klass)
+          @qualified_query_builders[shard.id] ||= klass.connection.cacheable_query(self.class, @arel)
+        end
       end
 
       module BindMap

data/lib/switchman/engine.rb

@@ -129,6 +129,9 @@ module Switchman
 
         ::ActiveRecord::LogSubscriber.prepend(ActiveRecord::LogSubscriber)
         ::ActiveRecord::Migration.prepend(ActiveRecord::Migration)
+        if ::Rails.version >= '5'
+          ::ActiveRecord::Migration::Compatibility::V5_0.prepend(ActiveRecord::Migration::Compatibility::V5_0)
+        end
         ::ActiveRecord::Migrator.prepend(ActiveRecord::Migrator)
 
         ::ActiveRecord::Reflection::AbstractReflection.include(ActiveRecord::Reflection::AbstractReflection)

data/lib/switchman/r_spec_helper.rb

@@ -118,7 +118,8 @@ module Switchman
       klass.before do
         raise "Sharding did not set up correctly" if @@sharding_failed
         Shard.clear_cache
-        if (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
+        if ::Rails.version >= '5.1' ? use_transactional_tests :
+          (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
           Shard.default(true)
           @shard1 = Shard.find(@shard1.id)
           @shard2 = Shard.find(@shard2.id)
@@ -134,7 +135,8 @@ module Switchman
 
       klass.after do
         next if @@sharding_failed
-        if (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
+        if ::Rails.version >= '5.1' ? use_transactional_tests :
+           (::Rails.version >= '5' && use_transactional_tests) || use_transactional_fixtures
           shards = [@shard2]
           shards << @shard1 unless @shard1.database_server == Shard.default.database_server
           shards.each do |shard|

data/lib/switchman/version.rb

@@ -1,3 +1,3 @@
 module Switchman
-  VERSION = "1.9.14"
+  VERSION = "1.10.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: switchman
 version: !ruby/object:Gem::Version
-  version: 1.9.14
+  version: 1.10.0
 platform: ruby
 authors:
 - Cody Cutrer
@@ -19,9 +19,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -29,9 +29,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
@@ -39,9 +39,9 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -49,23 +49,23 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '4.2'
-    - - "<="
+    - - "<"
       - !ruby/object:Gem::Version
-        version: '5.1'
+        version: '5.2'
 - !ruby/object:Gem::Dependency
   name: shackles
   requirement: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 1.3.0
+        version: '1.3'
 - !ruby/object:Gem::Dependency
   name: open4
   requirement: !ruby/object:Gem::Requirement
@@ -86,14 +86,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: 2.1.0
+        version: '2.1'
 - !ruby/object:Gem::Dependency
   name: byebug
   requirement: !ruby/object:Gem::Requirement