diff options
| author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-06 16:29:22 +0100 |
|---|---|---|
| committer | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-06 16:29:22 +0100 |
| commit | 1818c4e8b49d053ca7a220288dd6823984bc0328 (patch) | |
| tree | f21122b0708f60eeca19ad5073f313f595c61bba /activerecord/lib | |
| parent | 525e7720d04e4dba8a4cf9fb289799cc4f230f30 (diff) | |
| download | rails-1818c4e8b49d053ca7a220288dd6823984bc0328.tar.gz rails-1818c4e8b49d053ca7a220288dd6823984bc0328.tar.bz2 rails-1818c4e8b49d053ca7a220288dd6823984bc0328.zip | |
Add some whitespace for readability.
Diffstat (limited to 'activerecord/lib')
| -rw-r--r-- | activerecord/lib/active_record/insert_all.rb | 2 |
1 files changed, 2 insertions, 0 deletions
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! |