activerecord-insert_many 0.4.1 → 0.4.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 6dbaae41683d3696dc009ab77f2336300b575aca
-  data.tar.gz: 5e27992b665f5eabba30d6c4a78142c26ae38ffb
+  metadata.gz: 4f3a11efa931742fc96cb84de9f2f605fd9e1e42
+  data.tar.gz: e12ef9f2fac223018001c3c6cb1e09d726e54eb4
 SHA512:
-  metadata.gz: 71cfbc32243757c8a395c3db1728fd850fc342b91e7cf87c151891be13b61cad1ec705e5c8d4275d38724b52fb1e82749a6f46af8493650147838c18c93185e0
-  data.tar.gz: 568d4744662f878b7edea647faad93878b7cb0affd753030fd134bd54c60046f49055e8abf85c7c59ecc8cbd7ce4438a95c030c88c673625719470d34154df90
+  metadata.gz: 2e107a6951bd83c3fd519beccac395f6bbc3f89935c01c361601a00dd4784748a64835d8caa088f1aff4da9d266d431b9fe3a43ec3298339bf3bfdf138aeeedf
+  data.tar.gz: 48e70bc7be5c1027b80c45c8fb50c45a06cc1ae2fd65061a5e753718ea7db5acabc257cc1f8c6d63a1919543b2934b43920cdcfd25184135065539e20efa022a

data/lib/activerecord/insert_many.rb

@@ -66,14 +66,17 @@ module ActiveRecord
         conflict_columns = Array.wrap(conflict.fetch(:column, schema_cache.primary_keys(table_name)))
         raise ArgumentError, "To use the :on_conflict option, you must specify :column" unless conflict_columns.any?
 
+        conflict_do = conflict.fetch(:do)
+        raise ArgumentError, "#{conflict_do.inspect} is an unknown value for conflict[:do]; must be :nothing or :update" unless [:nothing, :update].member?(conflict_do)
+
         conflict_columns = conflict_columns.map(&method(:quote_column_name))
-        case conflict_do = conflict.fetch(:do)
-        when :nothing
-          sql << " ON CONFLICT(#{conflict_columns.join(",")}) DO NOTHING"
-        when :update
-          sql << " ON CONFLICT(#{conflict_columns.join(",")}) DO UPDATE SET #{(key_list - conflict_columns).map { |key| "#{key} = excluded.#{key}" }.join(", ")}"
+        sql << " ON CONFLICT(#{conflict_columns.join(",")})"
+        sql << " WHERE #{conflict[:where]}" if conflict[:where]
+
+        if conflict_do == :nothing
+          sql << " DO NOTHING"
         else
-          raise ArgumentError, "#{conflict_do.inspect} is an unknown value for conflict[:do]; must be :nothing or :update"
+          sql << " DO UPDATE SET #{(key_list - conflict_columns).map { |key| "#{key} = excluded.#{key}" }.join(", ")}"
         end
       end
 

data/lib/activerecord/insert_many/version.rb

@@ -1,5 +1,5 @@
 module Activerecord
   module InsertMany
-    VERSION = "0.4.1"
+    VERSION = "0.4.2"
   end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-insert_many
 version: !ruby/object:Gem::Version
-  version: 0.4.1
+  version: 0.4.2
 platform: ruby
 authors:
 - Luke Booth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-06-07 00:00:00.000000000 Z
+date: 2018-05-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord