rm sql_transaction config

Author: tracyloisel

lib/csv_importer/config.rb

@@ -9,15 +9,13 @@ class Config
     attribute :when_invalid, Symbol, default: proc { :skip }
     attribute :after_build_blocks, Array[Proc], default: []
     attribute :after_save_blocks, Array[Proc], default: []
-    attribute :sql_transaction, Symbol, default: proc { :all_rows }
 
     def initialize_copy(orig)
       super
       self.column_definitions = orig.column_definitions.dup
       self.identifiers = orig.identifiers.dup
       self.after_save_blocks = orig.after_save_blocks.dup
       self.after_build_blocks = orig.after_build_blocks.dup
-      self.sql_transaction = orig.sql_transaction.dup
     end
 
     def after_build(block)

lib/csv_importer/dsl.rb

@@ -27,9 +27,5 @@ def after_build(&block)
     def after_save(&block)
       config.after_save(block)
     end
-
-    def sql_transaction(behavior)
-      config.sql_transaction = behavior
-    end
   end
 end

lib/csv_importer/runner.rb

@@ -12,7 +12,6 @@ def self.call(*args)
     attribute :rows, Array[Row]
     attribute :when_invalid, Symbol
     attribute :after_save_blocks, Array[Proc], default: []
-    attribute :sql_transaction, Symbol
 
     attribute :report, Report, default: proc { Report.new }
 
@@ -42,48 +41,38 @@ def abort_when_invalid?
       when_invalid == :abort
     end
 
-    def sql_transaction_all_rows?
-      sql_transaction == :all_rows
-    end
-
-    def sql_transaction_one_row?
-      sql_transaction == :each_row
-    end
-
     def persist_rows!
-      full_transaction do
+      transaction do
         rows.each do |row|
-          transaction do
-            tags = []
+          tags = []
 
-            if row.model.persisted?
-              tags << :update
-            else
-              tags << :create
-            end
+          if row.model.persisted?
+            tags << :update
+          else
+            tags << :create
+          end
 
-            if row.skip?
-              tags << :skip
-            elsif row.errors.size > 0
-              tags << :failure
+          if row.skip?
+            tags << :skip
+          elsif row.errors.size > 0
+            tags << :failure
+          else
+            if row.model.save
+              tags << :success
             else
-              if row.model.save
-                tags << :success
-              else
-                tags << :failure
-              end
+              tags << :failure
             end
+          end
 
-            add_to_report(row, tags)
+          add_to_report(row, tags)
 
-            after_save_blocks.each do |block|
-              case block.arity
-              when 0 then block.call
-              when 1 then block.call(row.model)
-              when 2 then block.call(row.model, row.csv_attributes)
-              else
-                raise ArgumentError, "after_save block of arity #{ block.arity } is not supported"
-              end
+          after_save_blocks.each do |block|
+            case block.arity
+            when 0 then block.call
+            when 1 then block.call(row.model)
+            when 2 then block.call(row.model, row.csv_attributes)
+            else
+              raise ArgumentError, "after_save block of arity #{ block.arity } is not supported"
             end
           end
         end
@@ -113,20 +102,8 @@ def add_to_report(row, tags)
       raise ImportAborted if abort_when_invalid? && tags[1] == :failure
     end
 
-    def full_transaction(&block)
-      if sql_transaction_all_rows?
-        rows.first.model.class.transaction(&block)
-      else
-        block.call
-      end
-    end
-
     def transaction(&block)
-      if sql_transaction_one_row?
-        rows.first.model.class.transaction(&block)
-      else
-        block.call
-      end
+      rows.first.model.class.transaction(&block)
     end
   end
 end