active_record_bulk_insert 1.0.3 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c5617c164c167fc88a439beabb1e33362f51a7e6
-  data.tar.gz: 35543d200074044baa24c5e131f88ced54cfcf26
+  metadata.gz: 480b59f2af018604382897c14b7429039abb6e92
+  data.tar.gz: c9ac794a5474b28fd6475536aa9dae2f1ee67af4
 SHA512:
-  metadata.gz: d175599e02ca65ba95dd3dfbbad4138d6d75d5ec8e438033bec8e1ca586dd27c291fee65f5213854c1cc74974eeb924d851f1bdbba02848c19a2a4c9d12f7db6
-  data.tar.gz: 7f6a9e92d3b090747f3a83ad65ad63fc54be37814dde88b0aba3fd15ab5b653be42ce3b7be3e05a10f28b071a72c131ca822f6375076de998a8efb74e434b3c9
+  metadata.gz: 326b9b67bfa9c11aff90d89a7056335a94b95c5d707a6b0780ac37aa4a0ae425d81e90f992445ba16fb8b48fdd8fe85070377299a1c1f098bcf5d10ebdefc167
+  data.tar.gz: c880802bcb693a22f981818fc6e0f7fffcca71be2530e6e68f296373b64e3c46be866c67e3d9315d639923123ec373780ad2ad14a6bc7a771c92f3893da0fb95

data/README.md

@@ -57,6 +57,7 @@ users = [{:id => 200, :username => "foo", :firstname => "Foo", :lastname => "Bar
 User.bulk_insert(users, :use_provided_primary_key => true)
 ```
 *note this is only available from ActiveRecord 4.0 as id was protected from mass-assignment in ActiveRecord < 4.0*
+*The return value is a list of invalid records*
 
 ### Disable default timestamps
 

data/lib/active_record_bulk_insert.rb

@@ -3,10 +3,12 @@ ActiveRecord::Base.class_eval do
     batch_size = options.fetch(:batch_size, 1000)
     delay      = options.fetch(:delay, nil)
 
-    attrs.each_slice(batch_size).map do |sliced_attrs|
-      bulk_insert(sliced_attrs, options)
+    invalid = []
+    attrs.each_slice(batch_size) do |sliced_attrs|
+      invalid += bulk_insert(sliced_attrs, options)
       sleep(delay) if delay
-    end.flatten.compact
+    end
+    invalid
   end
 
   def self.bulk_insert(attrs, options = {})
@@ -15,12 +17,13 @@ ActiveRecord::Base.class_eval do
     use_provided_primary_key = options.fetch(:use_provided_primary_key, false)
     attributes = _resolve_record(attrs.first, options).keys.join(", ")
 
+    invalid = []
     if options.fetch(:validate, false)
       attrs, invalid = attrs.partition { |record| _validate(record) }
     end
 
     values_sql = attrs.map do |record|
-      "(#{_resolve_record(record, options).values.map { |r| sanitize(r) }.join(', ')})"
+      "(#{_resolve_record(record, options).map {|k, v| connection.quote(v, try(:column_for_attribute, k)) }.join(', ')})"
     end.join(",")
 
     sql = <<-SQL

data/spec/sample_record_spec.rb

@@ -78,6 +78,13 @@ describe SampleRecord do
         SampleRecord.send(:validates, :name, :presence => true)
         expect {SampleRecord.bulk_insert([:age => 30], :validate => true)}.to_not change{SampleRecord.count}
       end
+
+      it "returns the invalid records" do
+        SampleRecord.send(:validates, :name, :presence => true)
+        records = [{:age => 30, :name => ""}, {:age => 29, :name => "Foo"}]
+        invalid_records = SampleRecord.bulk_insert(records, :validate => true, :disable_timestamps => true)
+        invalid_records.should == [{:age => 30, :name => ""}]
+      end
     end
 
     context "timestamps" do
@@ -119,5 +126,15 @@ describe SampleRecord do
       SampleRecord.should_receive(:sleep).with(2)
       SampleRecord.bulk_insert_in_batches(records, :delay => 2)
     end
+
+    context "validations" do
+      it "returns the invalid records" do
+        SampleRecord.send(:validates, :name, :presence => true)
+        records = [{:age => 30, :name => ""}, {:age => 29, :name => "Foo"}]
+
+        invalid_records = SampleRecord.bulk_insert_in_batches(records, :batch_size => 1, :validate => true, :disable_timestamps => true)
+        invalid_records.should == [{:age => 30, :name => ""}]
+      end
+    end
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bulk_insert
 version: !ruby/object:Gem::Version
-  version: 1.0.3
+  version: 1.1.0
 platform: ruby
 authors:
 - Abejide Ayodele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-22 00:00:00.000000000 Z
+date: 2016-07-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -73,12 +73,12 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- README.md
 - lib/active_record_bulk_insert.rb
 - spec/sample_record_spec.rb
 - spec/spec_helper.rb
 - spec/support/migrations/1_sample_record_migration.rb
 - spec/support/sample_record.rb
-- README.md
 homepage: https://github.com/bjhaid/active_record_bulk_insert
 licenses:
 - MIT
@@ -89,17 +89,17 @@ require_paths:
 - lib
 required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
-  - - '>='
+  - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.0.14
+rubygems_version: 2.4.5.1
 signing_key: 
 specification_version: 4
 summary: bulk insert records into the DB