diff options
author | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-31 20:17:57 +0200 |
---|---|---|
committer | Kasper Timm Hansen <kaspth@gmail.com> | 2019-03-31 20:17:57 +0200 |
commit | 6bc02140a3877d877d1af13cd16470f2ab26a4e2 (patch) | |
tree | b4895cad9c797b6f6aa05395be4b50148265674e /activerecord/lib/active_record | |
parent | 2ea8bfd040c947683a8b68c3b21e17f9ca31a780 (diff) | |
download | rails-6bc02140a3877d877d1af13cd16470f2ab26a4e2.tar.gz rails-6bc02140a3877d877d1af13cd16470f2ab26a4e2.tar.bz2 rails-6bc02140a3877d877d1af13cd16470f2ab26a4e2.zip |
Use accessors internally; remove needless validation
Diffstat (limited to 'activerecord/lib/active_record')
-rw-r--r-- | activerecord/lib/active_record/insert_all.rb | 8 |
1 files changed, 2 insertions, 6 deletions
diff --git a/activerecord/lib/active_record/insert_all.rb b/activerecord/lib/active_record/insert_all.rb index d41baf560b..4b02d40aa0 100644 --- a/activerecord/lib/active_record/insert_all.rb +++ b/activerecord/lib/active_record/insert_all.rb @@ -73,15 +73,11 @@ module ActiveRecord raise ArgumentError, "#{connection.class} does not support :returning" end - unless %i{ raise skip update }.member?(on_duplicate) - raise NotImplementedError, "#{on_duplicate.inspect} is an unknown value for :on_duplicate. Valid values are :raise, :skip, and :update" - end - - if on_duplicate == :skip && !connection.supports_insert_on_duplicate_skip? + if skip_duplicates? && !connection.supports_insert_on_duplicate_skip? raise ArgumentError, "#{connection.class} does not support skipping duplicates" end - if on_duplicate == :update && !connection.supports_insert_on_duplicate_update? + if update_duplicates? && !connection.supports_insert_on_duplicate_update? raise ArgumentError, "#{connection.class} does not support upsert" end |