From 1818c4e8b49d053ca7a220288dd6823984bc0328 Mon Sep 17 00:00:00 2001 From: Kasper Timm Hansen Date: Wed, 6 Mar 2019 16:29:22 +0100 Subject: Add some whitespace for readability. --- activerecord/lib/active_record/insert_all.rb | 2 ++ 1 file changed, 2 insertions(+) (limited to 'activerecord/lib') diff --git a/activerecord/lib/active_record/insert_all.rb b/activerecord/lib/active_record/insert_all.rb index 6d14ff70b6..5baaea344b 100644 --- a/activerecord/lib/active_record/insert_all.rb +++ b/activerecord/lib/active_record/insert_all.rb @@ -8,8 +8,10 @@ module ActiveRecord raise ArgumentError, "Empty list of attributes passed" if inserts.blank? @model, @connection, @inserts, @on_duplicate, @returning, @unique_by = model, model.connection, inserts, on_duplicate, returning, unique_by + @returning = (connection.supports_insert_returning? ? primary_keys : false) if @returning.nil? @returning = false if @returning == [] + @on_duplicate = :skip if @on_duplicate == :update && updatable_columns.empty? ensure_valid_options_for_connection! -- cgit v1.2.3