Merge pull request #798 from OtaYohihiro/fix_track_validation_failures

add index when models exists
zdennis · Apr 14, 2023 · 75b751f · 75b751f
2 parents 748309d + 2b6b867
commit 75b751f
Showing 1 changed file with 5 additions and 1 deletion.
diff --git a/lib/activerecord-import/import.rb b/lib/activerecord-import/import.rb
@@ -697,7 +697,11 @@ def import_helper( *args )
       return_obj = if is_validating
         import_with_validations( column_names, array_of_attributes, options ) do |failed_instances|
           if models
-            models.each { |m| failed_instances << m if m.errors.any? }
+            models.each_with_index do |m, i|
+              next unless m.errors.any?
+
+              failed_instances << (options[:track_validation_failures] ? [i, m] : m)
+            end
           else
             # create instances for each of our column/value sets
             arr = validations_array_for_column_names_and_attributes( column_names, array_of_attributes )