activerecord-turntable 2.3.1 → 2.3.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c9925e8594c361459fef18234ff7b4e15d712f5c
-  data.tar.gz: a8d958172d8917882fc7755956e8199179338fb7
+  metadata.gz: c476ca06fe32521466081db5b034dfe1130aafbb
+  data.tar.gz: 9028b37ecd050d7b72a9899648646c1d4ad264a7
 SHA512:
-  metadata.gz: d7689b939906852fd6218d0ce4168c3f55fcb10c817abbf07d910f32d3b7596cc9e3fa328061658b8396c2c624629679fa826791b97e409bede0f8533d176769
-  data.tar.gz: 5b9efb2e4302bdac577741f69d6290a4fd0facc30920d9c179efb0625741e07abc04f505b0ab6586405012cba0a3b0a266bfe0df3dc145ce4428c35c602640c9
+  metadata.gz: dc66f30118970d7d9650d88a6cb41a554c80287a43c20dde5dcfa41cc2376b81e16e3d9d2cb3d6733b80d664d9abe602857c0a2c6ec042f35860938b220eb9be
+  data.tar.gz: 243b4ed88d4c256ca3614941fcd5567023559afc6a5aaf8d8e9b67548dbe3ad85e28b33944eca3693eb605e80e2c085ad2c366e244dd523e9f0823e2276cb012

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## activerecord-turntable 2.3.2 ##
+
+### Improvement
+
+* ActiveRecord::Import follow ActiveRecord 5 (thx mitaku)
+
 ## activerecord-turntable 2.3.1 ##
 
 ### Improvement

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

@@ -11,6 +11,7 @@ module ActiveRecord::Turntable
       private
 
       # @note override for sequencer injection
+      # @see https://github.com/zdennis/activerecord-import/blob/ba909fed5a4785fe9c7cce89e48e1242bb6804ea/lib/activerecord-import/import.rb#L558-L581
       def values_sql_for_columns_and_attributes_with_turntable(columns, array_of_attributes)
         connection_memo = connection
         array_of_attributes.map do |arr|
@@ -24,11 +25,13 @@ module ActiveRecord::Turntable
               else
                 connection_memo.next_value_for_sequence(sequence_name)
               end
-            else
-              if serialized_attributes.include?(column.name)
-                connection_memo.quote(serialized_attributes[column.name].dump(val), column)
-              else
-                connection_memo.quote(val, column)
+            elsif column
+              if respond_to?(:type_caster) && type_caster.respond_to?(:type_cast_for_database) # Rails 5.0 and higher
+                connection_memo.quote(type_caster.type_cast_for_database(column.name, val))
+              elsif column.respond_to?(:type_cast_from_user)                      # Rails 4.2 and higher
+                connection_memo.quote(column.type_cast_from_user(val), column)
+              else                                                                # Rails 3.1, 3.2, and 4.1
+                connection_memo.quote(column.type_cast(val), column)
               end
             end
           end

data/lib/active_record/turntable/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Turntable
-    VERSION = "2.3.1"
+    VERSION = "2.3.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-turntable
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.3.2
 platform: ruby
 authors:
 - gussan
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-12 00:00:00.000000000 Z
+date: 2016-03-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -522,3 +522,4 @@ test_files:
 - spec/spec_helper.rb
 - spec/support/matchers/be_saved_to.rb
 - spec/support/turntable_helper.rb
+has_rdoc: