activerecord-import 2.2.0 → 3.0.0

data/lib/activerecord-import/synchronize.rb

@@ -25,40 +25,52 @@ 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
 
-        next unless matched_instance
+      instances.select do |instance|
+        key = keys.map { |key_column| instance.send(key_column) }
+        matched_instance = fresh_instances_by_key[key]
 
-        instance.instance_variable_set :@association_cache, {}
-        instance.send :clear_aggregation_cache if instance.respond_to?(:clear_aggregation_cache, true)
-        instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
+        next false unless matched_instance
 
-        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
+        instance.instance_variable_set :@association_cache, {}
+        instance.send :clear_aggregation_cache
+        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.2.0"
+    VERSION = "3.0.0"
   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,14 +1,13 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 2.2.0
+  version: 3.0.0
 platform: ruby
 authors:
 - Zach Dennis
-autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-05-27 00:00:00.000000000 Z
+date: 1980-01-02 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -16,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
@@ -45,152 +44,48 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/test.yaml"
-- ".gitignore"
-- ".rubocop.yml"
-- ".rubocop_todo.yml"
-- Brewfile
 - CHANGELOG.md
-- Dockerfile
-- Gemfile
 - LICENSE
 - README.markdown
-- Rakefile
-- activerecord-import.gemspec
-- benchmarks/README
-- benchmarks/benchmark.rb
-- benchmarks/lib/base.rb
-- benchmarks/lib/cli_parser.rb
-- benchmarks/lib/float.rb
-- benchmarks/lib/mysql2_benchmark.rb
-- benchmarks/lib/output_to_csv.rb
-- benchmarks/lib/output_to_html.rb
-- benchmarks/models/test_innodb.rb
-- benchmarks/models/test_memory.rb
-- benchmarks/models/test_myisam.rb
-- benchmarks/schema/mysql2_schema.rb
-- docker-compose.yml
-- gemfiles/5.2.gemfile
-- gemfiles/6.0.gemfile
-- gemfiles/6.1.gemfile
-- gemfiles/7.0.gemfile
-- gemfiles/7.1.gemfile
-- gemfiles/7.2.gemfile
-- gemfiles/8.0.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcpostgresql_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcsqlite3_adapter.rb
 - lib/activerecord-import/active_record/adapters/mysql2_adapter.rb
+- lib/activerecord-import/active_record/adapters/mysql2_proxy_adapter.rb
 - lib/activerecord-import/active_record/adapters/postgresql_adapter.rb
+- lib/activerecord-import/active_record/adapters/postgresql_proxy_adapter.rb
 - lib/activerecord-import/active_record/adapters/seamless_database_pool_adapter.rb
 - lib/activerecord-import/active_record/adapters/sqlite3_adapter.rb
+- lib/activerecord-import/active_record/adapters/sqlite3_proxy_adapter.rb
 - lib/activerecord-import/active_record/adapters/trilogy_adapter.rb
+- lib/activerecord-import/active_record/adapters/trilogy_proxy_adapter.rb
 - lib/activerecord-import/adapters/abstract_adapter.rb
+- lib/activerecord-import/adapters/active_record_proxy_adapter.rb
 - lib/activerecord-import/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql2_adapter.rb
+- lib/activerecord-import/adapters/mysql2_proxy_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
 - lib/activerecord-import/adapters/postgresql_adapter.rb
+- lib/activerecord-import/adapters/postgresql_proxy_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
+- 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
-- test/adapters/janus_mysql2.rb
-- test/adapters/janus_trilogy.rb
-- test/adapters/jdbcmysql.rb
-- test/adapters/jdbcpostgresql.rb
-- test/adapters/jdbcsqlite3.rb
-- test/adapters/makara_postgis.rb
-- test/adapters/mysql2.rb
-- test/adapters/mysql2_makara.rb
-- test/adapters/mysql2_proxy.rb
-- test/adapters/mysql2spatial.rb
-- test/adapters/postgis.rb
-- test/adapters/postgresql.rb
-- test/adapters/postgresql_makara.rb
-- test/adapters/postgresql_proxy.rb
-- test/adapters/seamless_database_pool.rb
-- test/adapters/spatialite.rb
-- test/adapters/sqlite3.rb
-- test/adapters/trilogy.rb
-- test/database.yml.sample
-- test/github/database.yml
-- test/import_test.rb
-- test/janus_mysql2/import_test.rb
-- test/janus_trilogy/import_test.rb
-- test/jdbcmysql/import_test.rb
-- test/jdbcpostgresql/import_test.rb
-- test/jdbcsqlite3/import_test.rb
-- test/makara_postgis/import_test.rb
-- test/models/account.rb
-- test/models/alarm.rb
-- test/models/animal.rb
-- test/models/author.rb
-- test/models/bike_maker.rb
-- test/models/book.rb
-- test/models/car.rb
-- test/models/card.rb
-- test/models/chapter.rb
-- test/models/composite_book.rb
-- test/models/composite_chapter.rb
-- test/models/customer.rb
-- test/models/deck.rb
-- test/models/dictionary.rb
-- test/models/discount.rb
-- test/models/end_note.rb
-- test/models/group.rb
-- test/models/order.rb
-- test/models/playing_card.rb
-- test/models/promotion.rb
-- test/models/question.rb
-- test/models/rule.rb
-- test/models/tag.rb
-- test/models/tag_alias.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
-- test/mysql2_makara/import_test.rb
-- test/mysql2_proxy/import_test.rb
-- test/mysqlspatial2/import_test.rb
-- test/postgis/import_test.rb
-- test/postgresql/import_test.rb
-- test/postgresql_proxy/import_test.rb
-- test/schema/generic_schema.rb
-- test/schema/jdbcpostgresql_schema.rb
-- test/schema/mysql2_schema.rb
-- test/schema/postgis_schema.rb
-- test/schema/postgresql_schema.rb
-- test/schema/sqlite3_schema.rb
-- test/schema/version.rb
-- test/sqlite3/import_test.rb
-- test/support/active_support/test_case_extensions.rb
-- test/support/assertions.rb
-- test/support/factories.rb
-- test/support/generate.rb
-- test/support/mysql/import_examples.rb
-- test/support/postgresql/import_examples.rb
-- test/support/shared_examples/on_duplicate_key_ignore.rb
-- test/support/shared_examples/on_duplicate_key_update.rb
-- test/support/shared_examples/recursive_import.rb
-- test/support/sqlite3/import_examples.rb
-- test/synchronize_test.rb
-- test/test_helper.rb
-- test/trilogy/import_test.rb
-- test/value_sets_bytes_parser_test.rb
-- test/value_sets_records_parser_test.rb
+- lib/activerecord-import/without_aliases.rb
 homepage: https://github.com/zdennis/activerecord-import
 licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md
-post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -198,101 +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: 3.0.3.1
-signing_key: 
+rubygems_version: 4.0.0
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
-test_files:
-- test/adapters/janus_mysql2.rb
-- test/adapters/janus_trilogy.rb
-- test/adapters/jdbcmysql.rb
-- test/adapters/jdbcpostgresql.rb
-- test/adapters/jdbcsqlite3.rb
-- test/adapters/makara_postgis.rb
-- test/adapters/mysql2.rb
-- test/adapters/mysql2_makara.rb
-- test/adapters/mysql2_proxy.rb
-- test/adapters/mysql2spatial.rb
-- test/adapters/postgis.rb
-- test/adapters/postgresql.rb
-- test/adapters/postgresql_makara.rb
-- test/adapters/postgresql_proxy.rb
-- test/adapters/seamless_database_pool.rb
-- test/adapters/spatialite.rb
-- test/adapters/sqlite3.rb
-- test/adapters/trilogy.rb
-- test/database.yml.sample
-- test/github/database.yml
-- test/import_test.rb
-- test/janus_mysql2/import_test.rb
-- test/janus_trilogy/import_test.rb
-- test/jdbcmysql/import_test.rb
-- test/jdbcpostgresql/import_test.rb
-- test/jdbcsqlite3/import_test.rb
-- test/makara_postgis/import_test.rb
-- test/models/account.rb
-- test/models/alarm.rb
-- test/models/animal.rb
-- test/models/author.rb
-- test/models/bike_maker.rb
-- test/models/book.rb
-- test/models/car.rb
-- test/models/card.rb
-- test/models/chapter.rb
-- test/models/composite_book.rb
-- test/models/composite_chapter.rb
-- test/models/customer.rb
-- test/models/deck.rb
-- test/models/dictionary.rb
-- test/models/discount.rb
-- test/models/end_note.rb
-- test/models/group.rb
-- test/models/order.rb
-- test/models/playing_card.rb
-- test/models/promotion.rb
-- test/models/question.rb
-- test/models/rule.rb
-- test/models/tag.rb
-- test/models/tag_alias.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
-- test/mysql2_makara/import_test.rb
-- test/mysql2_proxy/import_test.rb
-- test/mysqlspatial2/import_test.rb
-- test/postgis/import_test.rb
-- test/postgresql/import_test.rb
-- test/postgresql_proxy/import_test.rb
-- test/schema/generic_schema.rb
-- test/schema/jdbcpostgresql_schema.rb
-- test/schema/mysql2_schema.rb
-- test/schema/postgis_schema.rb
-- test/schema/postgresql_schema.rb
-- test/schema/sqlite3_schema.rb
-- test/schema/version.rb
-- test/sqlite3/import_test.rb
-- test/support/active_support/test_case_extensions.rb
-- test/support/assertions.rb
-- test/support/factories.rb
-- test/support/generate.rb
-- test/support/mysql/import_examples.rb
-- test/support/postgresql/import_examples.rb
-- test/support/shared_examples/on_duplicate_key_ignore.rb
-- test/support/shared_examples/on_duplicate_key_update.rb
-- test/support/shared_examples/recursive_import.rb
-- test/support/sqlite3/import_examples.rb
-- test/synchronize_test.rb
-- test/test_helper.rb
-- test/trilogy/import_test.rb
-- test/value_sets_bytes_parser_test.rb
-- test/value_sets_records_parser_test.rb
+test_files: []

data/.github/workflows/test.yaml

@@ -1,165 +0,0 @@
-name: Test
-on: [push, pull_request]
-jobs:
-  test:
-    services:
-      postgres:
-        image: postgis/postgis:10-2.5
-        env:
-          POSTGRES_USER: postgres
-          POSTGRES_PASSWORD: postgres
-        ports:
-          - 5432:5432
-        # Set health checks to wait until postgres has started
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-      mysql:
-        image: mysql:5.7
-        ports:
-          - 3306:3306
-        env:
-          MYSQL_HOST: 127.0.0.1
-          MYSQL_ROOT_PASSWORD: root
-          MYSQL_USER: github
-          MYSQL_PASSWORD: github
-          MYSQL_DATABASE: activerecord_import_test
-        options: >-
-          --health-cmd "mysqladmin ping -h localhost"
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby:
-          - 3.3
-        env:
-          - AR_VERSION: '8.0'
-            RUBYOPT: --enable-frozen-string-literal
-          - AR_VERSION: '7.2'
-            RUBYOPT: --enable-frozen-string-literal
-          - AR_VERSION: '7.1'
-            RUBYOPT: --enable-frozen-string-literal
-          - AR_VERSION: '7.0'
-            RUBYOPT: --enable-frozen-string-literal
-          - AR_VERSION: 6.1
-            RUBYOPT: --enable-frozen-string-literal
-        include:
-          - ruby: 3.2
-            env:
-              AR_VERSION: '8.0'
-          - ruby: 3.2
-            env:
-              AR_VERSION: '7.2'
-          - ruby: 3.2
-            env:
-              AR_VERSION: '7.1'
-          - ruby: 3.2
-            env:
-              AR_VERSION: '7.0'
-          - ruby: 3.2
-            env:
-              AR_VERSION: 6.1
-          - ruby: 3.1
-            env:
-              AR_VERSION: '7.1'
-          - ruby: 3.1
-            env:
-              AR_VERSION: '7.0'
-          - ruby: 3.1
-            env:
-              AR_VERSION: 6.1
-          - ruby: '3.0'
-            env:
-              AR_VERSION: '7.0'
-          - ruby: '3.0'
-            env:
-              AR_VERSION: 6.1
-          - ruby: jruby-9.4.8.0
-            env:
-              AR_VERSION: '7.0'
-          - ruby: 2.7
-            env:
-              AR_VERSION: '7.0'
-          - ruby: 2.7
-            env:
-              AR_VERSION: 6.1
-          - ruby: 2.7
-            env:
-              AR_VERSION: '6.0'
-          - ruby: jruby-9.3.15.0
-            env:
-              AR_VERSION: '6.1'
-          - ruby: 2.6
-            env:
-              AR_VERSION: 5.2
-    runs-on: ubuntu-latest
-    env:
-      AR_VERSION: ${{ matrix.env.AR_VERSION }}
-      DB_DATABASE: activerecord_import_test
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install SQLite3 Development Library
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsqlite3-dev
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby }}
-          bundler-cache: true
-          rubygems: latest
-      - name: Set up databases
-        run: |
-          psql -h localhost -U postgres -c 'create database ${{ env.DB_DATABASE }};'
-          psql -h localhost -U postgres -d ${{ env.DB_DATABASE }} -c 'create extension if not exists hstore;'
-          psql -h localhost -U postgres -c 'create extension if not exists postgis;'
-          psql -h localhost -U postgres -c 'create extension if not exists "uuid-ossp";'
-          cp test/github/database.yml test/database.yml
-        env:
-          PGPASSWORD: postgres
-      - name: Run tests with mysql2
-        run: |
-          bundle exec rake test:mysql2
-          bundle exec rake test:mysql2_makara
-          bundle exec rake test:mysql2spatial
-          bundle exec rake test:mysql2_proxy
-          bundle exec rake test:janus_mysql2
-      - name: Run tests with postgresql
-        run: |
-          bundle exec rake test:postgis
-          bundle exec rake test:postgresql
-          bundle exec rake test:postgresql_makara
-          bundle exec rake test:postgresql_proxy
-      - name: Run tests with seamless_database_pool
-        run: |
-          bundle exec rake test:seamless_database_pool
-        if: ${{ matrix.ruby < '3.0' }}
-      - name: Run tests with sqlite
-        run: |
-          bundle exec rake test:spatialite
-          bundle exec rake test:sqlite3
-      - name: Run trilogy tests
-        if: ${{ matrix.env.AR_VERSION >= '7.0' && !startsWith(matrix.ruby, 'jruby') }}
-        run: |
-          bundle exec rake test:trilogy
-          bundle exec rake test:janus_trilogy
-
-  lint:
-    runs-on: ubuntu-latest
-    env:
-      AR_VERSION: '7.0'
-    steps:
-      - uses: actions/checkout@v4
-      - name: Install SQLite3 Development Library
-        run: |
-          sudo apt-get update
-          sudo apt-get install libsqlite3-dev
-      - uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: 3.0
-          bundler-cache: true
-      - name: Run Rubocop
-        run: bundle exec rubocop

data/.gitignore

@@ -1,37 +0,0 @@
-## MAC OS
-.DS_Store
-
-## TEXTMATE
-*.tmproj
-tmtags
-
-## EMACS
-*~
-\#*
-.\#*
-
-## VIM
-*.swp
-
-## Idea
-.idea
-
-## PROJECT::GENERAL
-coverage
-rdoc
-pkg
-*.gem
-*.lock
-.byebug_history
-
-## PROJECT::SPECIFIC
-log/*.log
-test.db
-test/database.yml
-benchmarks/log/
-
-.ruby-*
-.bundle/
-.redcar/
-.rvmrc
-docsite/