activerecord-turntable 4.2.0 → 4.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4cced005d4106f1fe4e91d38fa233de92139928169754bb96303ab14e11e731b
-  data.tar.gz: 80e4e77bcc89380430968ee18b5831667db76ca0872c734879456f9b9aacccdf
+  metadata.gz: 6d1d03f8216a73b1e732c4c1c22c6eda6d9843661121a2c5c85543ca6da51e32
+  data.tar.gz: e71f85959d36f0dbb806ed287ba9137a45c30645fdfafbf6d845799ab3de3fc0
 SHA512:
-  metadata.gz: '04769f9f47f94395e4bb5fda699e4807ca992283f5cf2c11abab2cb498757bd8e07ff6062d4cf8f130f6ec3244f65c844347f95adbb5e967555560bca07b4b9d'
-  data.tar.gz: 272bcec55c63d01b7488f5c480d0ce7dd77e0bfe57de18e3222736b5d838a53e460bee872e7040a29c6521541201fcfc70fda298bc636f02cf547cf98d995f98
+  metadata.gz: 2bffbb3be5a6d1ccd5f4fb69a7a6c4af0c41f63f56188e6aee394979d9310f37646243ef3e3b035bf28767a2c25b70d4b10bda9544f0070b232364834476a61f
+  data.tar.gz: 72c016be4117d12955f448aba07d3f02c2262fb590e8c3b2361aeae9a307aab3d588520e28da8d3e6cb421b9649e751a05ff901fdfe4a6349577f7505730b466

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## activerecord-turntable 4.3.0 ##
+
+### Bugfixes
+
+* Fix `NoMethodError` on boot with production env
+* Fix not working patches for activerecord-import
+
 ## activerecord-turntable 4.2.0 ##
 
 ### Major Changes

data/README.md

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

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

@@ -3,10 +3,9 @@ module ActiveRecord::Turntable
     # activerecord-import extension
     module ActiverecordImportExt
       # @note override for sequencer injection
-      # @see https://github.com/zdennis/activerecord-import/blob/b325ebb644160a09db6e269e414f33561cb21272/lib/activerecord-import/import.rb#L661-L689
+      # @see https://github.com/zdennis/activerecord-import/blob/85586d052822b8d498ced6c900251997edbeee04/lib/activerecord-import/import.rb#L848-L883
       private def values_sql_for_columns_and_attributes(columns, array_of_attributes)
         connection_memo = connection
-        type_caster_memo = type_caster if respond_to?(:type_caster)
 
         array_of_attributes.map do |arr|
           my_values = arr.each_with_index.map do |val, j|
@@ -15,12 +14,16 @@ module ActiveRecord::Turntable
             # be sure to query sequence_name *last*, only if cheaper tests fail, because it's costly
             if val.nil? && column.name == primary_key && !sequence_name.blank?
               if sequencer_enabled?
-                connection_memo.next_sequence_value(sequence_name)
+                self.next_sequence_value
               else
                 connection_memo.next_value_for_sequence(sequence_name)
               end
+            elsif val.respond_to?(:to_sql)
+              "(#{val.to_sql})"
             elsif column
-              connection_memo.quote(type_caster_memo.type_cast_for_database(column.name, val))
+              type = type_for_attribute(column.name)
+              val = type.type == :boolean ? type.cast(val) : type.serialize(val)
+              connection_memo.quote(val)
             end
           end
           "(#{my_values.join(',')})"
@@ -31,6 +34,8 @@ module ActiveRecord::Turntable
     begin
       require "activerecord-import"
       require "activerecord-import/base"
+      require "activerecord-import/active_record/adapters/mysql2_adapter"
+      ActiveRecord::Turntable::ConnectionProxy.include(ActiveRecord::Import::Mysql2Adapter)
       (class << ActiveRecord::Base; self; end).prepend(ActiverecordImportExt)
     rescue LoadError # rubocop:disable Lint/HandleExceptions
     end

data/lib/active_record/turntable/pool_proxy.rb

@@ -11,8 +11,8 @@ module ActiveRecord::Turntable
       yield proxy
     end
 
-    delegate :connected?, :automatic_reconnect, :automatic_reconnect=, :checkout_timeout, :dead_connection_timeout,
-             :spec, :connections, :size, :reaper, :table_exists?, :query_cache_enabled, :enable_query_cache!, to: :proxy
+    delegate :connected?, :checkout_timeout, :automatic_reconnect, :automatic_reconnect=, :checkout_timeout, :checkout_timeout=, :dead_connection_timeout,
+             :spec, :connections, :size, :reaper, :table_exists?, :query_cache_enabled, :enable_query_cache!, :schema_cache, :schema_cache=, to: :proxy
 
     %w(columns_hash column_defaults primary_keys).each do |name|
       define_method(name.to_sym) do
@@ -30,18 +30,32 @@ module ActiveRecord::Turntable
       connection_pools_list.any?(&:active_connection?)
     end
 
-    %w(disconnect!
-       release_connection
-       clear_all_connections!
-       clear_active_connections!
-       clear_reloadable_connections!
-       clear_stale_cached_connections!
-       verify_active_connections!).each do |name|
+    %w[
+      clear_active_connections!
+      clear_all_connections!
+      clear_reloadable_connections!
+      clear_stale_cached_connections!
+      disconnect
+      disconnect!
+      flush!
+      reap
+      release_connection
+      verify_active_connections!
+    ].each do |name|
       define_method(name.to_sym) do
         connection_pools_list.each { |cp| cp.public_send(name.to_sym) }
       end
     end
 
+    %w[
+      clear_reloadable_connections
+      flush
+    ].each do |name|
+      define_method(name.to_sym) do |args|
+        connection_pools_list.each { |cp| cp.public_send(name.to_sym, *args) }
+      end
+    end
+
     def discard!
       # Nothing to do
     end

data/lib/active_record/turntable/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 4.2.0
+  version: 4.3.0
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-21 00:00:00.000000000 Z
+date: 2018-06-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord