active_record_bulk_insert 1.1.0 → 1.2.0

checksums.yaml

@@ -1,7 +1,15 @@
 ---
-SHA1:
-  metadata.gz: 480b59f2af018604382897c14b7429039abb6e92
-  data.tar.gz: c9ac794a5474b28fd6475536aa9dae2f1ee67af4
+!binary "U0hBMQ==":
+  metadata.gz: !binary |-
+    MjEyNGY3MzlkZTc3ZDkyOTRkYjdkMGFiZjUwYzVjNTFmN2M0NDVmYQ==
+  data.tar.gz: !binary |-
+    NGFmMWVkN2U1ZWFmNTZmMDJiOTgxYzRjM2M4OWI1M2RkOThiYTNhMQ==
 SHA512:
-  metadata.gz: 326b9b67bfa9c11aff90d89a7056335a94b95c5d707a6b0780ac37aa4a0ae425d81e90f992445ba16fb8b48fdd8fe85070377299a1c1f098bcf5d10ebdefc167
-  data.tar.gz: c880802bcb693a22f981818fc6e0f7fffcca71be2530e6e68f296373b64e3c46be866c67e3d9315d639923123ec373780ad2ad14a6bc7a771c92f3893da0fb95
+  metadata.gz: !binary |-
+    YWQ5MDA0ZmY0ZjllNDc0ZGI4ZjY5OTFjYmYxNjFhNzdhZWRiZGExYTEzMTdm
+    Mzk4Zjc3MzBjZDhjZWY5ZDZjMjlmMWVlYzUzOWY3ZTFhN2FmZTg2ZjgzMDFk
+    ODU0YTNiZWM1MGQ3ZTFkZTZlNzdlOGZjN2JkZDIwMmVkNTU2OGM=
+  data.tar.gz: !binary |-
+    MmU5MmRjMWUzMDQ0MzRmMmE3ZjJjNGJmZjQ0OTI4NDRmOTUyMGY2ODg2MDA4
+    NWNlMThjZGUwNzVlMGI2Y2ZiNmFiZGFmNTZjNTM2NjVkOTc0N2RhMDY4NmFl
+    YWJiOTU2MDg4ZDBmMDIwMDZhMTliNjQwNTgzN2EyYWQ0NDJkY2U=

data/README.md

@@ -1,4 +1,5 @@
 [![Gem Version](https://badge.fury.io/rb/active_record_bulk_insert.svg)](http://badge.fury.io/rb/active_record_bulk_insert)
+[![Build Status](https://api.travis-ci.org/bjhaid/active_record_bulk_insert.png)](https://travis-ci.org/bjhaid/active_record_bulk_insert)
 
 # BULK INSERT
 

data/lib/active_record_bulk_insert.rb

@@ -23,7 +23,10 @@ ActiveRecord::Base.class_eval do
     end
 
     values_sql = attrs.map do |record|
-      "(#{_resolve_record(record, options).map {|k, v| connection.quote(v, try(:column_for_attribute, k)) }.join(', ')})"
+      quoted = _resolve_record(record, options).map {|k, v|
+        _bulk_insert_quote(k, v)
+      }
+      "(#{quoted.join(', ')})"
     end.join(",")
 
     sql = <<-SQL
@@ -36,6 +39,20 @@ ActiveRecord::Base.class_eval do
     invalid
   end
 
+  def self._bulk_insert_quote(key, value)
+    case ActiveRecord::VERSION::MAJOR
+    when 5
+      column = try(:column_for_attribute, value)
+      value = connection.type_cast_from_column(column, value) if column
+      connection.quote(value)
+    when 4
+      column = try(:column_for_attribute, key)
+      connection.quote(value, column)
+    else
+      sanitize(value)
+    end
+  end
+
   def self._resolve_record(record, options)
     time = ActiveRecord::Base.default_timezone == :utc ? Time.now.utc : Time.now
     _record = record.is_a?(ActiveRecord::Base) ? record.attributes : record

data/spec/sample_record_spec.rb

@@ -31,27 +31,6 @@ describe SampleRecord do
       SampleRecord.bulk_insert(records)
     end
 
-    it "relies on the DB to provide primary_key if :use_provided_primary_key is false or nil" do
-      records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
-
-      ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
-        records.each do |record|
-          params.should_not include(record.id.to_s)
-        end
-      end
-
-      SampleRecord.bulk_insert(records)
-    end
-
-    it "uses provided primary_key if :use_provided_primary_key is true" do
-      records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
-
-      SampleRecord.bulk_insert(records, :use_provided_primary_key => true)
-      records.each do |record|
-        SampleRecord.exists?(:id => record.id).should be_true
-      end
-    end
-
     it "support insertion of ActiveRecord objects" do
       records = 10.times.map { |i| SampleRecord.new(:age => 4, :name => "Foo#{i}") }
 
@@ -73,6 +52,31 @@ describe SampleRecord do
       end.to_not raise_error
     end
 
+    if ActiveRecord::VERSION::MAJOR >= 4
+      context "use_provided_primary_key" do
+        it "relies on the DB to provide primary_key if :use_provided_primary_key is false or nil" do
+          records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+
+          ActiveRecord::ConnectionAdapters::SQLite3Adapter.any_instance.should_receive(:execute).with do |params|
+            records.each do |record|
+              params.should_not include(record.id.to_s)
+            end
+          end
+
+          SampleRecord.bulk_insert(records)
+        end
+
+        it "uses provided primary_key if :use_provided_primary_key is true" do
+          records = 10.times.map { |i| SampleRecord.new(:id => 10000 + i, :age => 4, :name => "Foo#{i}") }
+
+          SampleRecord.bulk_insert(records, :use_provided_primary_key => true)
+          records.each do |record|
+            SampleRecord.exists?(:id => record.id).should be_true
+          end
+        end
+      end
+    end
+
     context "validations" do
       it "should not persist invalid records if ':validate => true' is specified" do
         SampleRecord.send(:validates, :name, :presence => true)

data/spec/spec_helper.rb

@@ -4,9 +4,17 @@ require "database_cleaner"
 require "support/sample_record"
 
 ActiveRecord::Base.establish_connection(:adapter => "sqlite3", :database => ":memory:")
-ActiveRecord::Migration.verbose = false
+if ActiveRecord::VERSION::MAJOR == 5
+  MIGRATION_CLASS = ActiveRecord::Migration[5.0]
+else
+  MIGRATION_CLASS = ActiveRecord::Migration
+end
+
+MIGRATION_CLASS.verbose = false
 ActiveRecord::Migrator.migrate("spec/support/migrations")
 
+I18n.config.enforce_available_locales = false
+
 RSpec.configure do |config|
   config.treat_symbols_as_metadata_keys_with_true_values = true
   config.order = "random"

data/spec/support/migrations/1_sample_record_migration.rb

@@ -1,9 +1,9 @@
-class SampleRecordMigration < ActiveRecord::Migration
+class SampleRecordMigration < MIGRATION_CLASS
   def change
     create_table :sample_records do |t|
       t.text "name"
       t.integer "age"
-      t.timestamps
+      t.timestamps null: true
     end
   end
 end

metadata

@@ -1,43 +1,43 @@
 --- !ruby/object:Gem::Specification
 name: active_record_bulk_insert
 version: !ruby/object:Gem::Version
-  version: 1.1.0
+  version: 1.2.0
 platform: ruby
 authors:
 - Abejide Ayodele
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-07-06 00:00:00.000000000 Z
+date: 2016-12-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.0
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 4.0.0
+        version: 3.2.0
 - !ruby/object:Gem::Dependency
   name: database_cleaner
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.0.1
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: rspec
   requirement: !ruby/object:Gem::Requirement
@@ -56,16 +56,16 @@ dependencies:
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
   type: :development
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
-    - - '='
+    - - ! '>='
       - !ruby/object:Gem::Version
-        version: 1.3.7
+        version: '0'
 description: Exposes a bulk insert API to AR subclasses
 email:
 - abejideayodele@gmail.com
@@ -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.4.5.1
+rubygems_version: 2.4.8
 signing_key: 
 specification_version: 4
 summary: bulk insert records into the DB