activerecord-import 0.23.0 → 0.24.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 25b9f077b6e370081a1c29b59ba3ce50be68659c
-  data.tar.gz: adc5eff35697da10f5a6e3922980dfdd3ea849a6
+  metadata.gz: 7c157e7eabb443b03aa347b06bb39d8e50a685a2
+  data.tar.gz: ec11c5ca04b49a03aa98a19eac8c768ade01e7c0
 SHA512:
-  metadata.gz: c8211cc8ed17997e92e944c1d36533ce501d18401da25df549e700fdd37e4223f5bcef2a342b3c8aa74af31d23d16c932a6e39b2445dba83dc8866575da16196
-  data.tar.gz: 293a3eb933956824ec0fd0b9dfe760ba43d262b3154a5286f3cb33d677ae0c2949effd9c92006dbaa97f5748d97b289bd2483c5b68933ca8e2d8698c18d26111
+  metadata.gz: 3ac6e43987fe5b0309ca4a8346326d4f1c32cf5f30d8b342b260552d26caeb3bdc8bc0f8a89c9ac4671756f94797dc960cb70642eb70da1d8fec35b1a0eced95
+  data.tar.gz: ca600fdd1ec92ec39f34ab89216dee9137abfbf710dec6bd4678a6a7d130afab06a1a90631ab2aec1f3017842291e6e79177b8300d02a7b5498dd6ea42fb2dbf

data/CHANGELOG.md

@@ -1,11 +1,18 @@
+## Changes in 0.24.0
+
+### Fixes
+
+* Use the association primary key when importing. Thanks to @dpogue via \#512.
+* Allow association ids to be updated. Thanks to @Aristat via \#515.
+
 ## Changes in 0.23.0
 
 ### New Features
 
-* Rename `import` method to `bulk_import and alias to `import`. Thanks
+* Rename `import` method to `bulk_import` and alias to `import`. Thanks
   to @itay-grudev, @jkowens via \#498.
 * Increment lock_version on duplicate key update. Thanks to @aimerald
-  via \#400.
+  via \#500.
 
 ### Fixes
 

data/README.markdown

@@ -52,13 +52,13 @@ If `fake_name` adapter is needed by a gem (potentially called `activerecord-impo
 activerecord-import-fake_name/
 |-- activerecord-import-fake_name.gemspec
 |-- lib
+|   |-- activerecord-import-fake_name.rb
 |   |-- activerecord-import-fake_name
 |   |   |-- version.rb
 |   |-- activerecord-import
 |   |   |-- active_record
 |   |   |   |-- adapters
 |   |   |       |-- fake_name_adapter.rb
-|--activerecord-import-fake_name.rb
 ```
 
 When rubygems pushes the `lib` folder onto the load path a `require` will now find `activerecord-import/active_record/adapters/fake_name_adapter` as it runs through the lookup process for a ruby file under that path in `$LOAD_PATH`

data/lib/activerecord-import/import.rb

@@ -97,7 +97,7 @@ class ActiveRecord::Associations::CollectionAssociation
     symbolized_foreign_key = reflection.foreign_key.to_sym
     symbolized_column_names = model_klass.column_names.map(&:to_sym)
 
-    owner_primary_key = owner.class.primary_key
+    owner_primary_key = reflection.active_record_primary_key.to_sym
     owner_primary_key_value = owner.send(owner_primary_key)
 
     # assume array of model objects
@@ -276,6 +276,9 @@ class ActiveRecord::Base
     # == Options
     # * +validate+ - true|false, tells import whether or not to use
     #   ActiveRecord validations. Validations are enforced by default.
+    #   It skips the uniqueness validation for performance reasons.
+    #   You can find more details here:
+    #   https://github.com/zdennis/activerecord-import/issues/228
     # * +ignore+ - true|false, an alias for on_duplicate_key_ignore.
     # * +on_duplicate_key_ignore+ - true|false, tells import to discard
     #   records that contain duplicate keys. For Postgres 9.5+ it adds
@@ -785,13 +788,14 @@ class ActiveRecord::Base
     def load_association_ids(model)
       association_reflections = model.class.reflect_on_all_associations(:belongs_to)
       association_reflections.each do |association_reflection|
+        column_name = association_reflection.foreign_key
         next if association_reflection.options[:polymorphic]
         association = model.association(association_reflection.name)
         association = association.target
-        if association
-          association_primary_key = association_reflection.association_primary_key
-          model.public_send("#{association_reflection.foreign_key}=", association.send(association_primary_key))
-        end
+        next if association.blank? || model.public_send(column_name).present?
+
+        association_primary_key = association_reflection.association_primary_key
+        model.public_send("#{column_name}=", association.send(association_primary_key))
       end
     end
 

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.23.0".freeze
+    VERSION = "0.24.0".freeze
   end
 end

data/test/import_test.rb

@@ -596,6 +596,14 @@ describe "#import" do
           assert_equal [val1, val2], scope.map(&column).sort
         end
       end
+
+      it "works with a non-standard association primary key" do
+        user = User.create(id: 1, name: 'Solomon')
+        user.user_tokens.import [:id, :token], [[5, '12345abcdef67890']]
+
+        token = UserToken.find(5)
+        assert_equal 'Solomon', token.user_name
+      end
     end
   end
 

data/test/models/user.rb

@@ -1 +1,3 @@
-class User < ActiveRecord::Base; end
+class User < ActiveRecord::Base
+  has_many :user_tokens, primary_key: :name, foreign_key: :user_name
+end

data/test/models/user_token.rb

@@ -0,0 +1,3 @@
+class UserToken < ActiveRecord::Base
+  belongs_to :user, primary_key: :name, foreign_key: :user_name
+end

data/test/schema/generic_schema.rb

@@ -164,6 +164,11 @@ ActiveRecord::Schema.define do
     t.integer :lock_version, null: false, default: 0
   end
 
+  create_table :user_tokens, force: :cascade do |t|
+    t.string :user_name, null: false
+    t.string :token, null: false
+  end
+
   create_table :accounts, force: :cascade do |t|
     t.string :name, null: false
     t.integer :lock, null: false, default: 0

data/test/support/shared_examples/recursive_import.rb

@@ -116,7 +116,10 @@ def should_support_recursive_import
     end
 
     it "imports an imported belongs_to association id" do
-      books = new_topics[0].books.to_a
+      first_new_topic = new_topics[0]
+      second_new_topic = new_topics[1]
+
+      books = first_new_topic.books.to_a
       Topic.import new_topics, validate: false
 
       assert_difference "Book.count", books.size do
@@ -124,7 +127,16 @@ def should_support_recursive_import
       end
 
       books.each do |book|
-        assert_not_nil book.topic_id
+        assert_equal book.topic_id, first_new_topic.id
+      end
+
+      books.each { |book| book.topic_id = second_new_topic.id }
+      assert_no_difference "Book.count", books.size do
+        Book.import books, validate: false, on_duplicate_key_update: [:topic_id]
+      end
+
+      books.each do |book|
+        assert_equal book.topic_id, second_new_topic.id
       end
     end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.23.0
+  version: 0.24.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2018-05-04 00:00:00.000000000 Z
+date: 2018-06-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -131,6 +131,7 @@ files:
 - test/models/tag.rb
 - test/models/topic.rb
 - test/models/user.rb
+- test/models/user_token.rb
 - test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb
@@ -218,6 +219,7 @@ test_files:
 - test/models/tag.rb
 - test/models/topic.rb
 - test/models/user.rb
+- test/models/user_token.rb
 - test/models/vendor.rb
 - test/models/widget.rb
 - test/mysql2/import_test.rb