activerecord-import 0.18.2 → 0.18.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 0ebf1fdae1a4d300498ed6ba18ea8d4039697734
-  data.tar.gz: 41e6dfff68a59c0fd9184691cbe6731cc420df8d
+  metadata.gz: 32bb7874255a2f1979d7fc370e46c9c614c362df
+  data.tar.gz: 7b45f6b4f22e64c032d320b34fa0989af63fb4aa
 SHA512:
-  metadata.gz: ba3161f35e5521a4febe1a66e729f9a9c549620f54119992d87a834148dc3a42f9e28f3f4c4ca9fb722a0c73639ca678db6d9363325fe6e73a5fb61b58422c59
-  data.tar.gz: 4248f96c0adbd65300e1ba161ea91fcf707ac151523121ac9bc541d24cec8f32229bde28ac1783ea6ec69c1f3043f3ac5b5a06c094d2fe9f2c04f952128a0cf6
+  metadata.gz: fdba083a35bde877674eaadb6bccd5cb83d285370926ef8ca557f0fe3cef08912d011599513ef640f0e1f5bd3dcfd9d0bb0a6979040d08ae1424118035ef93b4
+  data.tar.gz: 570dc7bb80545e93cb00114ddf2f09795b410b402e3ba5cd3c3023fc18e974b53d7fc0b78a684440707b7fc7d9163fba84ea8df077d0a7214d2b0eb0556563df

data/CHANGELOG.md

@@ -1,3 +1,10 @@
+## Changes in 0.18.3
+
+### Fixes
+
+* Set models new_record attribute to false when importing with
+  :on_duplicate_key_ignore. Thanks to @nijikon, @jkowens via \#416.
+
 ## Changes in 0.18.2
 
 ### Fixes

data/lib/activerecord-import/import.rb

@@ -521,9 +521,7 @@ class ActiveRecord::Base
 
       # if we have ids, then set the id on the models and mark the models as clean.
       if models && support_setting_primary_key_of_imported_objects?
-        if options[:recursive] || !(options[:ignore] || options[:on_duplicate_key_ignore])
-          set_attributes_and_mark_clean(models, return_obj, timestamps)
-        end
+        set_attributes_and_mark_clean(models, return_obj, timestamps)
 
         # if there are auto-save associations on the models we imported that are new, import them as well
         import_associations(models, options.dup) if options[:recursive]
@@ -643,18 +641,24 @@ class ActiveRecord::Base
     def set_attributes_and_mark_clean(models, import_result, timestamps)
       return if models.nil?
       models -= import_result.failed_instances
-      import_result.ids.each_with_index do |id, index|
-        model = models[index]
-        model.id = id
+      models.each do |model|
         if model.respond_to?(:clear_changes_information) # Rails 4.0 and higher
           model.clear_changes_information
         else # Rails 3.2
           model.instance_variable_get(:@changed_attributes).clear
         end
         model.instance_variable_set(:@new_record, false)
+      end
 
-        timestamps.each do |attr, value|
-          model.send(attr + "=", value)
+      # if ids were returned for all models we know all were updated
+      if models.size == import_result.ids.size
+        import_result.ids.each_with_index do |id, index|
+          model = models[index]
+          model.id = id
+
+          timestamps.each do |attr, value|
+            model.send(attr + "=", value)
+          end
         end
       end
     end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.18.2".freeze
+    VERSION = "0.18.3".freeze
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.18.2
+  version: 0.18.3
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-05-05 00:00:00.000000000 Z
+date: 2017-05-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord