activerecord-import 2.3.0 → 3.0.1

data/lib/activerecord-import/synchronize.rb

@@ -25,40 +25,53 @@ module ActiveRecord # :nodoc:
     def self.synchronize(instances, keys = [primary_key])
       return if instances.empty?
 
+      synchronize_instances(instances, keys) do |instance, fresh_attributes|
+        instance.instance_variable_set :@attributes, fresh_attributes
+        instance.clear_changes_information
+      end
+      instances
+    end
+
+    # Finds the records matching the passed in +instances+ on +keys+ and
+    # yields each instance that has one together with the attributes of
+    # its record, for the block to update the instance with. Returns the
+    # instances that had a matching record.
+    def self.synchronize_instances(instances, keys) # :nodoc:
+      return [] if instances.empty?
+
       conditions = {}
 
-      key_values = keys.map { |key| instances.map(&key.to_sym) }
+      key_values = keys.map { |key| instances.map(&key.to_sym).uniq }
       keys.zip(key_values).each { |key, values| conditions[key] = values }
       order = keys.map { |key| "#{key} ASC" }.join(",")
 
       klass = instances.first.class
 
       fresh_instances = klass.unscoped.where(conditions).order(order)
-      instances.each do |instance|
-        matched_instance = fresh_instances.detect do |fresh_instance|
-          keys.all? { |key| fresh_instance.send(key) == instance.send(key) }
-        end
+      fresh_instances_by_key = fresh_instances.each_with_object({}) do |fresh_instance, records_by_key|
+        key = keys.map { |key_column| fresh_instance.send(key_column) }
+        records_by_key[key] ||= fresh_instance
+      end
+
+      instances.select do |instance|
+        key = keys.map { |key_column| instance.send(key_column) }
+        matched_instance = fresh_instances_by_key[key]
 
-        next unless matched_instance
+        next false unless matched_instance
 
         instance.instance_variable_set :@association_cache, {}
+        # Aggregations is only included in models that call composed_of
         instance.send :clear_aggregation_cache if instance.respond_to?(:clear_aggregation_cache, true)
-        instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
-
-        if instance.respond_to?(:clear_changes_information)
-          instance.clear_changes_information                      # Rails 4.2 and higher
-        else
-          instance.instance_variable_set :@attributes_cache, {}   # Rails 4.0, 4.1
-          instance.changed_attributes.clear                       # Rails 3.2
-          instance.previous_changes.clear
-        end
+        yield instance, matched_instance.instance_variable_get(:@attributes)
 
         # Since the instance now accurately reflects the record in
         # the database, ensure that instance.persisted? is true.
         instance.instance_variable_set '@new_record', false
         instance.instance_variable_set '@destroyed', false
+        true
       end
     end
+    private_class_method :synchronize_instances
 
     # See ActiveRecord::ConnectionAdapters::AbstractAdapter.synchronize
     def synchronize(instances, key = [ActiveRecord::Base.primary_key])

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "2.3.0"
+    VERSION = "3.0.1"
   end
 end

data/lib/activerecord-import/without_aliases.rb

@@ -0,0 +1,17 @@
+# frozen_string_literal: true
+
+# Loads activerecord-import without aliasing +import+ and +import!+ to
+# +bulk_import+ and +bulk_import!+, for compatibility with gems that define
+# their own +import+ method on models, such as elasticsearch-model:
+#
+#   gem "activerecord-import", require: "activerecord-import/without_aliases"
+#
+# This takes precedence over "activerecord-import" and "activerecord-import/base",
+# regardless of the order they are required in.
+
+require "active_support/lazy_load_hooks"
+
+ActiveSupport.on_load(:active_record) do
+  require "activerecord-import/core"
+  ActiveRecord::Import.skip_aliases!
+end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 2.3.0
+  version: 3.0.1
 platform: ruby
 authors:
 - Zach Dennis
@@ -15,14 +15,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '4.2'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: rake
   requirement: !ruby/object:Gem::Requirement
@@ -73,11 +73,14 @@ files:
 - lib/activerecord-import/adapters/sqlite3_proxy_adapter.rb
 - lib/activerecord-import/adapters/trilogy_adapter.rb
 - lib/activerecord-import/adapters/trilogy_proxy_adapter.rb
+- lib/activerecord-import/aliases.rb
 - lib/activerecord-import/base.rb
+- lib/activerecord-import/core.rb
 - lib/activerecord-import/import.rb
 - lib/activerecord-import/synchronize.rb
 - lib/activerecord-import/value_sets_parser.rb
 - lib/activerecord-import/version.rb
+- lib/activerecord-import/without_aliases.rb
 homepage: https://github.com/zdennis/activerecord-import
 licenses:
 - MIT
@@ -90,14 +93,14 @@ required_ruby_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
-      version: 2.4.0
+      version: 3.1.0
 required_rubygems_version: !ruby/object:Gem::Requirement
   requirements:
   - - ">="
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 4.0.0
+rubygems_version: 3.6.9
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files: []