abstract_importer 1.4.1 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: f9366e2d43d5040adc38eca851c665c22a8f15ee
-  data.tar.gz: 441e4ea070305989b22e5ba88d9111782012dd5f
+  metadata.gz: 75b8682cc7102c4700ff606c17d5761a3bd93bfe
+  data.tar.gz: a79b16c14e77b902400ce9a6149a4629d5b3d2d0
 SHA512:
-  metadata.gz: 4b886e1366ec2c04c3291a25e9b0c0f6ce3b970197aefbd5598a0894a21be79e598b23396969edde8f7e83291bf60ef36cd1f01e4e50979217fd9e729daf0388
-  data.tar.gz: 0bfd28f4e398e928d49fa6dbcfc3f5dc31f7d30517b35acdd5dbb2e57f38b3e1021b27a8b338544b11da79c4abb450835faa4430dff9470c2935de187ad0d6e9
+  metadata.gz: 260320a2d92c89d560866290b1871499ef2bbb83a64ec669cd1fd6b6e0d686b08813b785214c4f3bdbd246aa34d81c190a2f957f79ed53904aa3d9cdda000477
+  data.tar.gz: 11d5dbffe9b22088cdaa785ceb2c764055c465beb6afc87ddbf7163143ad083bb17672cef4b54d0a563669e4ef1ceedd4b4884a8c872d2a586c3aab154e85c70

data/Gemfile

@@ -1,4 +1,4 @@
-source 'https://rubygems.org'
+source "https://rubygems.org"
 
 # Specify your gem's dependencies in abstract_importer.gemspec
 gemspec

data/abstract_importer.gemspec

@@ -19,7 +19,7 @@ Gem::Specification.new do |spec|
 
   spec.add_dependency "activerecord", ">= 5.0"
   spec.add_dependency "activesupport", ">= 5.0"
-  spec.add_dependency "activerecord-insert_many", ">= 0.4.0"
+  spec.add_dependency "activerecord-insert_many", ">= 0.4.1"
   spec.add_dependency "progressbar"
 
   spec.add_development_dependency "bundler", "~> 1.3"

data/lib/abstract_importer/strategies/upsert_strategy.rb

@@ -7,7 +7,7 @@ module AbstractImporter
 
       def initialize(collection, options={})
         super
-        @insert_options.merge!(on_conflict: { column: remap_ids? ? :legacy_id : :id, do: :update })
+        @insert_options.merge!(on_conflict: { column: remap_ids? ? (association_attrs.keys + [:legacy_id]) : :id, do: :update })
       end
 
       # We won't skip any records for already being imported

data/lib/abstract_importer/version.rb

@@ -1,3 +1,3 @@
 module AbstractImporter
-  VERSION = "1.4.1"
+  VERSION = "1.5.0"
 end

data/test/support/schema.rb

@@ -11,7 +11,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.string   "pet_type"
     t.integer  "pet_id"
     t.index    "name", :unique => true
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "parents", :force => true do |t|
@@ -19,14 +19,14 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  "student_id"
     t.integer  "legacy_id"
     t.string   "name"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "locations", :force => true do |t|
     t.integer  "account_id"
     t.integer  "legacy_id"
     t.string   "slug"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "students_subjects", :force => true do |t|
@@ -38,7 +38,7 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  "account_id"
     t.integer  "legacy_id"
     t.string   "name"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "grades", :force => true do |t|
@@ -47,21 +47,21 @@ ActiveRecord::Schema.define(:version => 1) do
     t.integer  "student_id"
     t.integer  "legacy_id"
     t.string   "value"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "owls", :force => true do |t|
     t.integer  "account_id"
     t.integer  "legacy_id"
     t.string   "name"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "cats", :force => true do |t|
     t.integer  "account_id"
     t.integer  "legacy_id"
     t.string   "name"
-    t.index    "legacy_id", :unique => true
+    t.index    ["account_id", "legacy_id"], :unique => true
   end
 
   create_table "abilities", :force => true do |t|

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: abstract_importer
 version: !ruby/object:Gem::Version
-  version: 1.4.1
+  version: 1.5.0
 platform: ruby
 authors:
 - Bob Lail
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-26 00:00:00.000000000 Z
+date: 2017-06-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -44,14 +44,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 0.4.0
+        version: 0.4.1
 - !ruby/object:Gem::Dependency
   name: progressbar
   requirement: !ruby/object:Gem::Requirement