activerecord-turntable 4.1.0 → 4.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 31aa02feae321af087a80d9a1f9177c0ff7c139a
-  data.tar.gz: dbb3b7404067e3a2b756b96eaa5f76a51e27450d
+SHA256:
+  metadata.gz: 4cced005d4106f1fe4e91d38fa233de92139928169754bb96303ab14e11e731b
+  data.tar.gz: 80e4e77bcc89380430968ee18b5831667db76ca0872c734879456f9b9aacccdf
 SHA512:
-  metadata.gz: 3bb4919921852779beb4b1d31f67f524e5985921c5d00d613799417a769c80eeaf3eec5cd51deaa5ea061cdc0869b8295b785806a5febb2ca7979924482ac79b
-  data.tar.gz: e5f313cc055e68af9520db17c29edcb717b8459b3ccb65819fe9d17e08010937a938277fc2baafa469b4fb8555a7f8f88a1344cf89064eff3a6d259e2cd6fe12
+  metadata.gz: '04769f9f47f94395e4bb5fda699e4807ca992283f5cf2c11abab2cb498757bd8e07ff6062d4cf8f130f6ec3244f65c844347f95adbb5e967555560bca07b4b9d'
+  data.tar.gz: 272bcec55c63d01b7488f5c480d0ce7dd77e0bfe57de18e3222736b5d838a53e460bee872e7040a29c6521541201fcfc70fda298bc636f02cf547cf98d995f98

data/.travis.yml

@@ -27,6 +27,7 @@ gemfile:
   - gemfiles/rails5_1_4.gemfile
   - gemfiles/rails5_1_5.gemfile
   - gemfiles/rails5_1_6.gemfile
+  - gemfiles/rails5_2_0.gemfile
   - gemfiles/rails_edge.gemfile
 
 env:

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## activerecord-turntable 4.2.0 ##
+
+### Major Changes
+
+* Support activerecord v5.2.0
+
 ## activerecord-turntable 4.1.0 ##
 
 ### Major Changes

data/Gemfile

@@ -2,5 +2,8 @@ source "https://rubygems.org"
 
 gemspec
 
-gem "activerecord", "~> 5.1.6"
-gem "activesupport", "~> 5.1.6"
+gem "rails", "5.2.0"
+
+gem "actionview", "5.2.0"
+gem "activerecord", "5.2.0"
+gem "activesupport", "5.2.0"

data/README.md

@@ -27,7 +27,7 @@ MySQL only.
 Add to Gemfile:
 
 ```ruby
-gem 'activerecord-turntable', '~> 4.1.0'
+gem 'activerecord-turntable', '~> 4.2.0'
 ```
 
 Run a bundle install:

data/Rakefile

@@ -76,7 +76,7 @@ namespace :turntable do
         system(*%w|git submodule update --init|)
         system(*%w|git submodule foreach git fetch origin|)
         Dir.chdir("tmp/rails") do
-          system(*%W|git checkout #{ENV['ARVERSION']}|)
+          system(*%W|git checkout #{ENV["ARVERSION"]}|)
         end
         FileUtils.rm_r("test") if File.directory?("test")
         FileUtils.cp_r("tmp/rails/activerecord/test", ".")

data/activerecord-turntable.gemspec

@@ -3,7 +3,7 @@ require "active_record/turntable/version"
 Gem::Specification.new do |spec|
   spec.name = "activerecord-turntable"
   spec.version = ActiveRecord::Turntable::VERSION
-  spec.authors     = %w(gussan sue445)
+  spec.authors     = %w[gussan sue445]
   spec.homepage    = "https://github.com/drecom/activerecord-turntable"
   spec.summary = "ActiveRecord sharding extension"
   spec.description = "ActiveRecord sharding extension"
@@ -38,7 +38,7 @@ Gem::Specification.new do |spec|
   spec.add_development_dependency "guard-rspec"
   spec.add_development_dependency "guard-rubocop"
   spec.add_development_dependency "httpclient", ">= 0"
-  spec.add_development_dependency "mysql2"
+  spec.add_development_dependency "mysql2", "~> 0.4.4"
   spec.add_development_dependency "onkcop"
   spec.add_development_dependency "pry"
   spec.add_development_dependency "pry-byebug"
@@ -58,7 +58,7 @@ Gem::Specification.new do |spec|
   # activerecord testing dependencies
   spec.add_development_dependency "actionview"
   spec.add_development_dependency "bcrypt", "~> 3.1.11"
-  spec.add_development_dependency "minitest", "< 5.3.4"
-  spec.add_development_dependency "mocha", "~> 0.14"
+  spec.add_development_dependency "minitest"
+  spec.add_development_dependency "mocha"
   spec.add_development_dependency "sqlite3", "~> 1.3.6"
 end

data/gemfiles/rails5_0_0.gemfile

@@ -5,4 +5,6 @@ gem "activesupport", "5.0.0"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+
 gemspec :path => '../'

data/gemfiles/rails5_0_1.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.1"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_2.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.2"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_3.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.3"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_4.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.4"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_5.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.5"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_6.gemfile

@@ -5,4 +5,7 @@ gem "activesupport", "5.0.6"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_0_7.gemfile

@@ -3,4 +3,7 @@ source "https://rubygems.org"
 gem "activerecord", "5.0.7"
 gem "activesupport", "5.0.7"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_0.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.0"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_1.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.1"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_2.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.2"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_3.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.3"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_4.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.4"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_5.gemfile

@@ -6,4 +6,7 @@ gem "actionview", "5.1.5"
 
 gem "mysql2", "~> 0.4.4"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_1_6.gemfile

@@ -4,4 +4,7 @@ gem "activerecord", "5.1.6"
 gem "activesupport", "5.1.6"
 gem "actionview", "5.1.6"
 
+gem "minitest", "< 5.3.4"
+gem "mocha", "~> 0.14", require: false
+
 gemspec :path => '../'

data/gemfiles/rails5_2_0.gemfile

@@ -0,0 +1,9 @@
+source "https://rubygems.org"
+
+gem "rails", "5.2.0"
+gem "railties", "5.2.0"
+gem "activerecord", "5.2.0"
+gem "activesupport", "5.2.0"
+gem "actionview", "5.2.0"
+
+gemspec :path => '../'

data/lib/active_record/turntable/active_record_ext/abstract_adapter.rb

@@ -23,6 +23,28 @@ module ActiveRecord::Turntable
 
       # @note override for append current shard name
       # rubocop:disable Style/HashSyntax, Style/MultilineMethodCallBraceLayout
+      module V5_2
+        def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
+          @instrumenter.instrument(
+            "sql.active_record",
+            sql:                  sql,
+            name:                 name,
+            binds:                binds,
+            type_casted_binds:    type_casted_binds,
+            statement_name:       statement_name,
+            connection_id:        object_id,
+            turntable_shard_name: turntable_shard_name) do
+            begin
+              @lock.synchronize do
+                yield
+              end
+            rescue => e
+              raise translate_exception_class(e, sql)
+            end
+          end
+        end
+      end
+
       module V5_1
         def log(sql, name = "SQL", binds = [], type_casted_binds = [], statement_name = nil)
           @instrumenter.instrument(

data/lib/active_record/turntable/active_record_ext/association.rb

@@ -24,8 +24,14 @@ module ActiveRecord::Turntable
 
       private
 
-        def skip_statement_cache?
-          super || should_use_shard_key?
+        if Util.ar52_or_later?
+          def skip_statement_cache?(scope)
+            super || should_use_shard_key?
+          end
+        else
+          def skip_statement_cache?
+            super || should_use_shard_key?
+          end
         end
     end
   end

data/lib/active_record/turntable/active_record_ext/association_preloader.rb

@@ -4,14 +4,24 @@ module ActiveRecord::Turntable
   module ActiveRecordExt
     module AssociationPreloader
       include ShardingCondition
+      if Util.ar52_or_later?
+        def build_scope
+          returning_scope = super
+          if should_use_shard_key?
+            returning_scope = returning_scope.where(klass.turntable_shard_key => owners.map(&foreign_shard_key.to_sym).uniq)
+          end
+          returning_scope
 
-      # @note Override to add sharding condition on preload
-      def records_for(ids)
-        returning_scope = super
-        if should_use_shard_key?
-          returning_scope = returning_scope.where(klass.turntable_shard_key => owners.map(&foreign_shard_key.to_sym).uniq)
         end
-        returning_scope
+      else
+        # @note Override to add sharding condition on preload
+        def records_for(ids)
+          returning_scope = super
+          if should_use_shard_key?
+            returning_scope = returning_scope.where(klass.turntable_shard_key => owners.map(&foreign_shard_key.to_sym).uniq)
+          end
+          returning_scope
+        end
       end
     end
   end

data/lib/active_record/turntable/active_record_ext/fixtures.rb

@@ -9,63 +9,65 @@ module ActiveRecord
     extend ActiveRecord::Turntable::Util
 
     # rubocop:disable Style/MultilineMethodCallBraceLayout
-    def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
-      fixture_set_names = Array(fixture_set_names).map(&:to_s)
-      class_names = ClassCache.new class_names, config
-
-      # FIXME: Apparently JK uses this.
-      connection = block_given? ? yield : ActiveRecord::Base.connection
-
-      files_to_read = fixture_set_names.reject { |fs_name|
-        fixture_is_cached?(connection, fs_name)
-      }
-
-      unless files_to_read.empty?
-        connection.disable_referential_integrity do
-          fixtures_map = {}
-
-          fixture_sets = files_to_read.map do |fs_name|
-            klass = class_names[fs_name]
-            conn = klass ? klass.connection : connection
-            fixtures_map[fs_name] = new( # ActiveRecord::FixtureSet.new
-              conn,
-              fs_name,
-              klass,
-              ::File.join(fixtures_directory, fs_name))
-          end
+    unless ar52_or_later?
+      def self.create_fixtures(fixtures_directory, fixture_set_names, class_names = {}, config = ActiveRecord::Base)
+        fixture_set_names = Array(fixture_set_names).map(&:to_s)
+        class_names = ClassCache.new class_names, config
+
+        # FIXME: Apparently JK uses this.
+        connection = block_given? ? yield : ActiveRecord::Base.connection
+
+        files_to_read = fixture_set_names.reject { |fs_name|
+          fixture_is_cached?(connection, fs_name)
+        }
+
+        unless files_to_read.empty?
+          connection.disable_referential_integrity do
+            fixtures_map = {}
+
+            fixture_sets = files_to_read.map do |fs_name|
+              klass = class_names[fs_name]
+              conn = klass ? klass.connection : connection
+              fixtures_map[fs_name] = new( # ActiveRecord::FixtureSet.new
+                conn,
+                fs_name,
+                klass,
+                ::File.join(fixtures_directory, fs_name))
+            end
 
-          update_all_loaded_fixtures fixtures_map
+            update_all_loaded_fixtures fixtures_map
 
-          ActiveRecord::Base.force_transaction_all_shards!(requires_new: true) do
-            deleted_tables = Hash.new { |h, k| h[k] = Set.new }
-            fixture_sets.each do |fs|
-              conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
-              table_rows = fs.table_rows
+            ActiveRecord::Base.force_transaction_all_shards!(requires_new: true) do
+              deleted_tables = Hash.new { |h, k| h[k] = Set.new }
+              fixture_sets.each do |fs|
+                conn = fs.model_class.respond_to?(:connection) ? fs.model_class.connection : connection
+                table_rows = fs.table_rows
 
-              table_rows.each_key do |table|
-                unless deleted_tables[conn].include? table
-                  conn.delete "DELETE FROM #{conn.quote_table_name(table)}", "Fixture Delete"
+                table_rows.each_key do |table|
+                  unless deleted_tables[conn].include? table
+                    conn.delete "DELETE FROM #{conn.quote_table_name(table)}", "Fixture Delete"
+                  end
+                  deleted_tables[conn] << table
                 end
-                deleted_tables[conn] << table
-              end
 
-              table_rows.each do |fixture_set_name, rows|
-                rows.each do |row|
-                  conn.insert_fixture(row, fixture_set_name)
+                table_rows.each do |fixture_set_name, rows|
+                  rows.each do |row|
+                    conn.insert_fixture(row, fixture_set_name)
+                  end
                 end
-              end
 
-              # Cap primary key sequences to max(pk).
-              if connection.respond_to?(:reset_pk_sequence!)
-                connection.reset_pk_sequence!(fs.table_name)
+                # Cap primary key sequences to max(pk).
+                if connection.respond_to?(:reset_pk_sequence!)
+                  connection.reset_pk_sequence!(fs.table_name)
+                end
               end
             end
-          end
 
-          cache_fixtures(connection, fixtures_map)
+            cache_fixtures(connection, fixtures_map)
+          end
         end
+        cached_fixtures(connection, fixture_set_names)
       end
-      cached_fixtures(connection, fixture_set_names)
     end
     # rubocop:enable Style/MultilineMethodCallLayout
   end

data/lib/active_record/turntable/active_record_ext/locking_optimistic.rb

@@ -4,6 +4,7 @@ module ActiveRecord::Turntable
       if Util.ar_version_equals_or_later?("5.1.6")
         ::ActiveRecord::Locking::Optimistic.class_eval <<-EOD
           private
+
           def _update_row(attribute_names, attempted_action = "update")
             return super unless locking_enabled?
 
@@ -22,10 +23,17 @@ module ActiveRecord::Turntable
                 constraints[self.class.turntable_shard_key] = self[self.class.turntable_shard_key]
               end
 
-              affected_rows = self.class.unscoped._update_record(
-                arel_attributes_with_values(attribute_names),
-                constraints,
-              )
+              if Util.ar52_or_later?
+                affected_rows = self.class._update_record(
+                  attributes_with_values(attribute_names),
+                  constraints,
+                )
+              else
+                affected_rows = self.class.unscoped._update_record(
+                  arel_attributes_with_values(attribute_names),
+                  constraints,
+                )
+              end
 
               if affected_rows != 1
                 raise ActiveRecord::StaleObjectError.new(self, attempted_action)
@@ -40,8 +48,7 @@ module ActiveRecord::Turntable
             end
           end
         EOD
-
-      elsif Util.ar51_or_later?
+      elsif Util.ar51?
         ::ActiveRecord::Locking::Optimistic.class_eval <<-EOD
           private
           # @note Override to add sharding condition on optimistic locking
@@ -91,7 +98,7 @@ module ActiveRecord::Turntable
             end
           end
         EOD
-      else
+      elsif Util.earlier_than_ar51?
         ::ActiveRecord::Locking::Optimistic.class_eval <<-EOD
           private
           # @note Override to add sharding condition on optimistic locking

data/lib/active_record/turntable/active_record_ext/persistence.rb

@@ -2,6 +2,7 @@ module ActiveRecord::Turntable
   module ActiveRecordExt
     module Persistence
       extend ActiveSupport::Concern
+      extend Compatibility
 
       ::ActiveRecord::Persistence.class_eval do
         # @note Override to add sharding scope on reloading
@@ -77,45 +78,61 @@ module ActiveRecord::Turntable
               true
             end
           end
+          # rubocop:enable Style/UnlessElse
         end
-        # rubocop:enable Style/UnlessElse
 
         # @note Override to add sharding scope on `update_columns`
-        def update_columns(attributes)
-          raise ActiveRecord::ActiveRecordError, "cannot update a new record" if new_record?
-          raise ActiveRecord::ActiveRecordError, "cannot update a destroyed record" if destroyed?
+        if Util.ar52_or_later?
+          def update_columns(attributes)
+            raise ActiveRecord::ActiveRecordError, "cannot update a new record" if new_record?
+            raise ActiveRecord::ActiveRecordError, "cannot update a destroyed record" if destroyed?
 
-          attributes.each_key do |key|
-            verify_readonly_attribute(key.to_s)
-          end
+            attributes.each_key do |key|
+              verify_readonly_attribute(key.to_s)
+            end
 
-          update_scope = if turntable_enabled? && self.class.primary_key != self.class.turntable_shard_key.to_s
-                           self.class.unscoped.where(self.class.turntable_shard_key => self.send(turntable_shard_key))
-                         else
-                           self.class.unscoped
-                         end
+            constraints = { self.class.primary_key => id_in_database }
+            if self.class.sharding_condition_needed?
+              constraints[self.class.turntable_shard_key] = self[self.class.turntable_shard_key]
+            end
+
+            affected_rows = self.class._update_record(
+              attributes,
+              constraints,
+            )
 
-          updated_count = update_scope.where(self.class.primary_key => id).update_all(attributes)
+            attributes.each do |k, v|
+              write_attribute_without_type_cast(k, v)
+            end
 
-          attributes.each do |k, v|
-            raw_write_attribute(k, v)
+            affected_rows == 1
           end
+        else
+          def update_columns(attributes)
+            raise ActiveRecord::ActiveRecordError, "cannot update a new record" if new_record?
+            raise ActiveRecord::ActiveRecordError, "cannot update a destroyed record" if destroyed?
 
-          updated_count == 1
-        end
+            attributes.each_key do |key|
+              verify_readonly_attribute(key.to_s)
+            end
 
-        private
+            update_scope = if turntable_enabled? && self.class.primary_key != self.class.turntable_shard_key.to_s
+                             self.class.unscoped.where(self.class.turntable_shard_key => self.send(turntable_shard_key))
+                           else
+                             self.class.unscoped
+                           end
 
-          # @note Override to add sharding scope on destroying
-          def relation_for_destroy
-            klass = self.class
-            relation = klass.unscoped.where(klass.primary_key => id)
+            updated_count = update_scope.where(self.class.primary_key => id).update_all(attributes)
 
-            if klass.turntable_enabled? && klass.primary_key != klass.turntable_shard_key.to_s
-              relation = relation.where(klass.turntable_shard_key => self[klass.turntable_shard_key])
+            attributes.each do |k, v|
+              raw_write_attribute(k, v)
             end
-            relation
+
+            updated_count == 1
           end
+        end
+
+        private
 
           if Util.ar_version_equals_or_later?("5.1.6")
             def _update_row(attribute_names, attempted_action = "update")
@@ -124,12 +141,38 @@ module ActiveRecord::Turntable
                 constraints[self.class.turntable_shard_key] = self[self.class.turntable_shard_key]
               end
 
+              attributes = Util.ar52_or_later? ? attributes_with_values(attribute_names) : arel_attributes_with_values(attribute_names)
+
               self.class.unscoped._update_record(
-                arel_attributes_with_values(attribute_names),
+                attributes,
                 constraints,
               )
             end
+          end
+
+          if Util.ar52_or_later?
+            def _delete_row
+              constraints = { self.class.primary_key => id_in_database }
+              if self.class.sharding_condition_needed?
+                constraints[self.class.turntable_shard_key] = self[self.class.turntable_shard_key]
+              end
+
+              self.class._delete_record(constraints)
+            end
           else
+            # @note Override to add sharding scope on destroying
+            def relation_for_destroy
+              klass = self.class
+              relation = klass.unscoped.where(klass.primary_key => id)
+
+              if klass.turntable_enabled? && klass.primary_key != klass.turntable_shard_key.to_s
+                relation = relation.where(klass.turntable_shard_key => self[klass.turntable_shard_key])
+              end
+              relation
+            end
+          end
+
+          if Util.ar_version_earlier_than?("5.1.6")
             # @note Override to add sharding scope on updating
             def _update_record(attribute_names = self.attribute_names)
               klass = self.class

data/lib/active_record/turntable/active_record_ext/query_cache.rb

@@ -10,6 +10,9 @@ module ActiveRecord::Turntable
       module ClassMethods
         extend Compatibility
 
+        module V5_2
+        end
+
         module V5_1
           def run
             result = super

data/lib/active_record/turntable/migration.rb

@@ -7,7 +7,11 @@ module ActiveRecord::Turntable::Migration
     class_attribute :target_shards, :current_shard
     ::ActiveRecord::ConnectionAdapters::AbstractAdapter.include(SchemaStatementsExt)
     ::ActiveRecord::Migration::CommandRecorder.include(CommandRecorder)
-    ::ActiveRecord::Migrator.prepend(Migrator)
+    if ActiveRecord::Turntable::Util.ar52_or_later?
+      ::ActiveRecord::MigrationContext.prepend(MigrationContext)
+    else
+      ::ActiveRecord::Migrator.prepend(Migrator)
+    end
   end
 
   module ShardDefinition
@@ -89,6 +93,43 @@ module ActiveRecord::Turntable::Migration
       end
   end
 
+  module MigrationContext
+    extend ActiveSupport::Concern
+
+    def up(target_version = nil)
+      result = super
+
+      ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected(current_environment) do |name, configuration|
+        puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+        super(target_version)
+      end
+
+      result
+    end
+
+    def down(target_version = nil)
+      result = super
+
+      ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected(current_environment) do |name, configuration|
+        puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+        super(target_version)
+      end
+
+      result
+    end
+
+    def run(direction, target_version)
+      result = super
+
+      ActiveRecord::Tasks::DatabaseTasks.each_current_turntable_cluster_connected(current_environment) do |name, configuration|
+        puts "[turntable] *** Migrating database: #{configuration['database']}(Shard: #{name})"
+        super(target_version)
+      end
+
+      result
+    end
+  end
+
   module Migrator
     extend ActiveSupport::Concern
 

data/lib/active_record/turntable/pool_proxy.rb

@@ -12,7 +12,7 @@ module ActiveRecord::Turntable
     end
 
     delegate :connected?, :automatic_reconnect, :automatic_reconnect=, :checkout_timeout, :dead_connection_timeout,
-             :spec, :connections, :size, :reaper, :table_exists?, to: :proxy
+             :spec, :connections, :size, :reaper, :table_exists?, :query_cache_enabled, :enable_query_cache!, to: :proxy
 
     %w(columns_hash column_defaults primary_keys).each do |name|
       define_method(name.to_sym) do
@@ -42,6 +42,10 @@ module ActiveRecord::Turntable
       end
     end
 
+    def discard!
+      # Nothing to do
+    end
+
     private
 
       def connection_pools_list

data/lib/active_record/turntable/sharding_condition.rb

@@ -3,15 +3,18 @@ module ActiveRecord::Turntable
     private
 
       def foreign_shard_key
-        options[:foreign_shard_key] || foreign_target_model.turntable_shard_key
+        reflection.options[:foreign_shard_key] || foreign_target_model.turntable_shard_key
       end
 
       def foreign_target_model
-        respond_to?(:model) ? model : owner
+        return model if respond_to?(:model)
+        return @model if instance_variable_defined?(:@model) && @model
+
+        owner
       end
 
       def should_use_shard_key?
-        sharded_by_same_key? || !!options[:foreign_shard_key]
+        sharded_by_same_key? || !!reflection.options[:foreign_shard_key]
       end
 
       def sharded_by_same_key?

data/lib/active_record/turntable/util.rb

@@ -19,14 +19,29 @@ module ActiveRecord::Turntable
       requirement.satisfied_by?(ar_version)
     end
 
+    def ar51?
+      ar51_or_later? && !ar52_or_later?
+    end
+
     def ar51_or_later?
       ar_version_equals_or_later?("5.1")
     end
 
+    def earlier_than_ar51?
+      ar_version_earlier_than?("5.1")
+    end
+
+    def ar52_or_later?
+      ar_version_equals_or_later?("5.2")
+    end
+
     module_function :ar_version_equals_or_later?,
                     :ar_version_earlier_than?,
                     :ar_version,
                     :ar_version_satisfy?,
-                    :ar51_or_later?
+                    :ar51?,
+                    :earlier_than_ar51?,
+                    :ar51_or_later?,
+                    :ar52_or_later?
   end
 end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "4.1.0".freeze
+    VERSION = "4.2.0".freeze
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 4.1.0
+  version: 4.2.0
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -209,16 +209,16 @@ dependencies:
   name: mysql2
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - ">="
+    - - "~>"
       - !ruby/object:Gem::Version
-        version: '0'
+        version: 0.4.4
 - !ruby/object:Gem::Dependency
   name: onkcop
   requirement: !ruby/object:Gem::Requirement
@@ -461,30 +461,30 @@ dependencies:
   name: minitest
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "<"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: 5.3.4
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: mocha
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - "~>"
+    - - ">="
       - !ruby/object:Gem::Version
-        version: '0.14'
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -538,6 +538,7 @@ files:
 - gemfiles/rails5_1_4.gemfile
 - gemfiles/rails5_1_5.gemfile
 - gemfiles/rails5_1_6.gemfile
+- gemfiles/rails5_2_0.gemfile
 - gemfiles/rails_edge.gemfile
 - lib/active_record/turntable.rb
 - lib/active_record/turntable/active_record_ext.rb
@@ -635,7 +636,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: activerecord-turntable
-rubygems_version: 2.6.14
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: ActiveRecord sharding extension