final

Author: ehasrouni

lib/activerecord-import/adapters/mysql_adapter.rb

@@ -39,7 +39,7 @@ def insert_many( sql, values, options = {}, *args ) # :nodoc:
       number_of_inserts += 1
       sql2insert = base_sql + values.join( ',' ) + post_sql
       result = execute( sql2insert, *args )
-      if result&.respond_to?(:affected_rows)
+      if result.respond_to?(:affected_rows)
         affected_rows = (affected_rows || 0) + result.affected_rows
       end
     else
@@ -52,9 +52,9 @@ def insert_many( sql, values, options = {}, *args ) # :nodoc:
           number_of_inserts += 1
           sql2insert = base_sql + value_set.join( ',' ) + post_sql
           result = execute( sql2insert, *args )
-      if result&.respond_to?(:affected_rows)
-        affected_rows = (affected_rows || 0) + result.affected_rows
-      end
+          if result.respond_to?(:affected_rows)
+            affected_rows = (affected_rows || 0) + result.affected_rows
+          end
         end
       end
     end
@@ -141,5 +141,4 @@ def increment_locking_column!(table_name, results, locking_column)
       results << "`#{locking_column}`=#{table_name}.`#{locking_column}`+1"
     end
   end
-
 end

lib/activerecord-import/import.rb

@@ -862,11 +862,7 @@ def import_without_validations_or_callbacks( conn, column_names, array_of_attrib
           number_inserted += result.num_inserts
           ids += result.ids
           results += result.results
-          if result.affected_rows.nil?
-            affected_rows = nil  # Keep nil if adapter doesn't support it
-          else
-            affected_rows = (affected_rows || 0) + result.affected_rows
-          end
+          affected_rows = result.affected_rows.nil? ? nil : (affected_rows || 0) + result.affected_rows
           current_batch += 1
 
           progress_proc.call(import_size, batches, current_batch, Time.now.to_i - batch_started_at) if run_proc