activerecord-insert_many 0.4.0 → 0.4.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ccd2651adecf544c3a1114e179191335e72f9b66
-  data.tar.gz: 26019103155000fc02819745814b203512f4c19c
+  metadata.gz: 6dbaae41683d3696dc009ab77f2336300b575aca
+  data.tar.gz: 5e27992b665f5eabba30d6c4a78142c26ae38ffb
 SHA512:
-  metadata.gz: a63e7b85373bc4833138af076a2246ccbf8758544b40aa8b82e534706c595500550c5753ff976584590c782ff37052520de6d9c92293700ecf417d276e5b35a9
-  data.tar.gz: 6cc7d788ca3b631f9a73ffe479624ac1b06873885b3609afba3c367df94ce0c715e88c7903b3b5330712d56bb3b4199242ef5ff775a8038fcceaff7180432387
+  metadata.gz: 71cfbc32243757c8a395c3db1728fd850fc342b91e7cf87c151891be13b61cad1ec705e5c8d4275d38724b52fb1e82749a6f46af8493650147838c18c93185e0
+  data.tar.gz: 568d4744662f878b7edea647faad93878b7cb0affd753030fd134bd54c60046f49055e8abf85c7c59ecc8cbd7ce4438a95c030c88c673625719470d34154df90

data/lib/activerecord/insert_many.rb

@@ -21,10 +21,20 @@ module ActiveRecord
       end
       return returning && [] if fixtures.empty?
 
+      sql = insert_many_sql(fixtures, table_name, options.merge(returning: returning))
+
+      result = execute sql, "Fixture Insert"
+
+      returning ? result.to_a : result
+    end
+
+    def insert_many_sql(fixtures, table_name, options={})
+      returning = options[:returning]
+
       columns = schema_cache.columns_hash(table_name)
 
       sample = fixtures.first
-      key_list = sample.map { |name, value| quote_column_name(name) }
+      key_list = sample.map { |name, _value| quote_column_name(name) }
       returning = returning.map { |name| quote_column_name(name) } if returning
 
       value_lists = fixtures.map do |fixture|
@@ -39,7 +49,7 @@ module ActiveRecord
           end
         end
 
-        prepare_binds_for_database(binds).map do |value|
+        binds.map(&:value_for_database).map do |value|
           begin
             quote(value)
           rescue TypeError
@@ -48,20 +58,20 @@ module ActiveRecord
         end
       end
 
-      sql = "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(', ')}) VALUES #{value_lists.map { |value| "(#{value.join(', ')})" }.join(",")}"
+      sql = "INSERT INTO #{quote_table_name(table_name)} (#{key_list.join(",")}) VALUES #{value_lists.map { |value| "(#{value.join(",")})" }.join(", ")}"
 
       if conflict = options[:on_conflict]
         raise ArgumentError, "To use the :on_conflict option, you must be using Postgres >= 9.5" unless supports_on_conflict?
 
-        conflict_column = conflict.fetch(:column, schema_cache.primary_keys(table_name))
-        raise ArgumentError, "To use the :on_conflict option, you must specify :column" unless conflict_column
+        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_column = quote_column_name(conflict_column)
+        conflict_columns = conflict_columns.map(&method(:quote_column_name))
         case conflict_do = conflict.fetch(:do)
         when :nothing
-          sql << " ON CONFLICT(#{conflict_column}) DO NOTHING"
+          sql << " ON CONFLICT(#{conflict_columns.join(",")}) DO NOTHING"
         when :update
-          sql << " ON CONFLICT(#{conflict_column}) DO UPDATE SET #{(key_list - [conflict_column]).map { |key| "#{key} = excluded.#{key}" }.join(", ")}"
+          sql << " ON CONFLICT(#{conflict_columns.join(",")}) DO UPDATE SET #{(key_list - conflict_columns).map { |key| "#{key} = excluded.#{key}" }.join(", ")}"
         else
           raise ArgumentError, "#{conflict_do.inspect} is an unknown value for conflict[:do]; must be :nothing or :update"
         end
@@ -69,9 +79,7 @@ module ActiveRecord
 
       sql << " RETURNING #{returning.join(",")}" if returning
 
-      result = execute sql, "Fixture Insert"
-
-      returning ? result.to_a : result
+      sql
     end
 
     def supports_on_conflict?

data/lib/activerecord/insert_many/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-insert_many
 version: !ruby/object:Gem::Version
-  version: 0.4.0
+  version: 0.4.1
 platform: ruby
 authors:
 - Luke Booth
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2016-10-17 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -174,7 +174,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.5.1
+rubygems_version: 2.6.11
 signing_key: 
 specification_version: 4
 summary: Adds a method for bulk-inserted records using ActiveRecord