activerecord-import 0.20.0 → 0.20.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b4613a9ba2a76e71320a6e8107b9b557f2413212
-  data.tar.gz: 2fb7c7b7a5f801cd591e5cea93b088f0f6d52499
+  metadata.gz: 2d7e1b67259d7a4d62e746876dfd781042aadba1
+  data.tar.gz: 3eedcc2001fae319e4867e292843a23c2bec1223
 SHA512:
-  metadata.gz: 72af6c0e217ef61e3bb87b1d078193d979f7d42e34dc5c721d5a26e72c50f1ce2b5a4a68808a2e4514b4a48135017c96cfef29e0dff4283fbc801d87b5039e18
-  data.tar.gz: 8b22f10f28ac4e0d7f7d66c4422abb6c4d7ff616a108ad5192cd4ba257e464c15b0dcb1f802c97a4f27bce1e6b57edaa48903d9ccfe68e75cd6c89ec0fa1229e
+  metadata.gz: 28a9b68a29cb302d421051b406989211926e7b65c6e9edba0a016787a33c23d8e8e3ba76b21946eeb7241014c17786e95213a6e65a9d72589c4c12e8cbf41864
+  data.tar.gz: aa61794f8678bb6ef3ebfc5d75728029f13ac1b87147cb1156bc414deaa8788c2fd08ed88d0ecd71963c4ee42a58d1d140ca80b7783d376238877435560a8a03

data/.travis.yml

@@ -1,7 +1,7 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.3
+  - 2.3.5
 
 env:
   global:
@@ -17,7 +17,7 @@ env:
 
 matrix:
   include:
-    - rvm: jruby-9.1.7.0
+    - rvm: jruby-9.1.9.0
       env: AR_VERSION=4.2
       before_install:
         - gem update --system

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Changes in 0.20.1
+
+### Fixes
+
+* Prevent :on_duplicate_key_update args from being modified. Thanks to @joshuamcginnis, @jkowens via \#451.
+
 ## Changes in 0.20.0
 
 ### New Features

data/lib/activerecord-import/adapters/postgresql_adapter.rb

@@ -177,7 +177,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
     if constraint_name.present?
       "ON CONSTRAINT #{constraint_name} "
     elsif conflict_target.present?
-      '(' << Array( conflict_target ).reject( &:empty? ).join( ', ' ) << ') '.tap do |sql|
+      '(' << Array( conflict_target ).reject( &:blank? ).join( ', ' ) << ') '.tap do |sql|
         sql << "WHERE #{index_predicate} " if index_predicate
       end
     end

data/lib/activerecord-import/import.rb

@@ -415,8 +415,13 @@ class ActiveRecord::Base
       options[:primary_key] = primary_key
 
       # Don't modify incoming arguments
-      if options[:on_duplicate_key_update] && options[:on_duplicate_key_update].duplicable?
-        options[:on_duplicate_key_update] = options[:on_duplicate_key_update].dup
+      on_duplicate_key_update = options[:on_duplicate_key_update]
+      if on_duplicate_key_update && on_duplicate_key_update.duplicable?
+        options[:on_duplicate_key_update] = if on_duplicate_key_update.is_a?(Hash)
+          on_duplicate_key_update.each { |k, v| on_duplicate_key_update[k] = v.dup if v.duplicable? }
+        else
+          on_duplicate_key_update.dup
+        end
       end
 
       is_validating = options[:validate]

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.20.0".freeze
+    VERSION = "0.20.1".freeze
   end
 end

data/test/support/postgresql/import_examples.rb

@@ -309,6 +309,13 @@ def should_support_postgresql_upsert_functionality
             @topic = Topic.find 99
           end
 
+          it "should not modify the passed in :on_duplicate_key_update columns array" do
+            assert_nothing_raised do
+              columns = %w(title author_name).freeze
+              Topic.import columns, [%w(foo, bar)], on_duplicate_key_update: { columns: columns }
+            end
+          end
+
           context "using string hash map" do
             let(:update_columns) { { "title" => "title", "author_email_address" => "author_email_address", "parent_id" => "parent_id" } }
             should_support_on_duplicate_key_update

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -7,7 +7,7 @@ def should_support_basic_on_duplicate_key_update
 
     context "with :on_duplicate_key_update" do
       describe "argument safety" do
-        it "should not modify the passed in :on_duplicate_key_update columns array" do
+        it "should not modify the passed in :on_duplicate_key_update array" do
           assert_nothing_raised do
             columns = %w(title author_name).freeze
             Topic.import columns, [%w(foo, bar)], on_duplicate_key_update: columns

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.20.0
+  version: 0.20.1
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-09-12 00:00:00.000000000 Z
+date: 2017-09-19 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord