activerecord-import 1.8.0 → 2.0.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d1478b29daf1e757c91a0ca8693bb1b03f9a90daa2fe02f0959576bcec900d85
-  data.tar.gz: dc938a1936c931182675a118ad24a37e2a7c5a27c0419e5bd947e0ec35aa4334
+  metadata.gz: f55c9faf85e948fbeb480ebca5baeca11b2275a626bc6ba7517e9d3e8c37e9e7
+  data.tar.gz: 80b267b08ef3a10bb91b029401e8fb6b49fdfcadeeb29a2e5e18fd6c8f529192
 SHA512:
-  metadata.gz: e276196113f433c8989a9a06cfad36df650105183a5559a548bdd8a04bd2da22db36ca996d2d0d04c4561b33ceb44559b50b4ad98e0a2d9f050b8084ee99c8e6
-  data.tar.gz: e699052ac2499bac23a9955fef71df853050767785d573523e23a1d216cfba9cb75b81b0db9f5e2afac02afbcb416563af6e7a2bf69f6d1288c6e6c71aeb7e5c
+  metadata.gz: f838da07331afe7827ad7d4f323ebf3f2191decd59a82359393f20eee866345258abb979875dd1c9b853533099797cdf7599ded20ca4e07997f8bce491f4c03e
+  data.tar.gz: 5a257bacb43492f25a65ecc382fe8ad126c4dac474eae7ee2beb3ba92c2cb95e64070a40cd20c48e47f46b51e64b69c2addd76a15fed75863df2ecb4a0fbdb70

data/.github/workflows/test.yaml

@@ -21,6 +21,7 @@ jobs:
         ports:
           - 3306:3306
         env:
+          MYSQL_HOST: 127.0.0.1
           MYSQL_ROOT_PASSWORD: root
           MYSQL_USER: github
           MYSQL_PASSWORD: github
@@ -36,6 +37,8 @@ jobs:
         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'
@@ -45,6 +48,9 @@ jobs:
           - 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'
@@ -72,7 +78,7 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
-          - ruby: jruby-9.4.5.0
+          - ruby: jruby-9.4.8.0
             env:
               AR_VERSION: '7.0'
           - ruby: 2.7
@@ -84,7 +90,7 @@ jobs:
           - ruby: 2.7
             env:
               AR_VERSION: '6.0'
-          - ruby: jruby-9.3.10.0
+          - ruby: jruby-9.3.15.0
             env:
               AR_VERSION: '6.1'
           - ruby: 2.6
@@ -96,6 +102,10 @@ jobs:
       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 }}
@@ -103,8 +113,6 @@ jobs:
           rubygems: latest
       - name: Set up databases
         run: |
-          sudo /etc/init.d/mysql start
-          mysql -e 'CREATE DATABASE ${{ env.DB_DATABASE }} CHARACTER SET utf8 COLLATE utf8_general_ci;' -u root -proot
           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;'
@@ -139,9 +147,13 @@ jobs:
       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: 2.7
+          ruby-version: 3.0
           bundler-cache: true
       - name: Run Rubocop
         run: bundle exec rubocop

data/.rubocop.yml

@@ -1,5 +1,8 @@
 inherit_from: .rubocop_todo.yml
 
+AllCops:
+  TargetRubyVersion: 3.0.x
+
 Metrics/AbcSize:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,23 @@
+## Changes in 2.0.0
+
+### Breaking Changes
+
+* Fix `recursive_on_duplicate_key_update` doesn't work with non-standard
+  association name. Thanks to @jacob-carlborg-apoex via \#852. The documentation for the
+  `:recursive_on_duplicate_key_update` option specifies that the hash key is
+  the association name. But previously the name of associated table was used to
+  look up the options. Now the behavior matches the documentation and the name
+  of the association is used instead. This only affects associations that uses
+  a name that doesn't follow the ActiveRecord naming conventions of
+  associations and class names, i.e. when the `class_name:` option is used on
+  an association.
+
+## Changes in 1.8.1
+
+### Fixes
+
+* Further update for ActiveRecord 7.2 compatibility when running validations. Thanks to @denisahearn  via \##847.
+
 ## Changes in 1.8.0
 
 ### New Features

data/Gemfile

@@ -6,13 +6,15 @@ gemspec
 
 version = ENV['AR_VERSION'].to_f
 
-mysql2_version = '0.3.0'
-mysql2_version = '0.4.0' if version >= 4.2
+mysql2_version = '0.4.0'
 mysql2_version = '0.5.0' if version >= 6.1
+mysql2_version = '0.5.6' if version >= 8.0
 sqlite3_version = '1.3.0'
 sqlite3_version = '1.4.0' if version >= 6.0
+sqlite3_version = '2.2.0' if version >= 8.0
 pg_version = '0.9'
 pg_version = '1.1' if version >= 6.1
+pg_version = '1.5' if version >= 8.0
 
 group :development, :test do
   gem 'rubocop'
@@ -51,19 +53,11 @@ gem "chronic"
 gem "mocha", "~> 2.1.0"
 
 # Debugging
-platforms :jruby do
-  gem "ruby-debug", "= 0.10.4"
-end
-
 platforms :ruby do
   gem "pry-byebug"
   gem "pry", "~> 0.14.0"
 end
 
-if version >= 4.0
-  gem "minitest"
-else
-  gem "test-unit"
-end
+gem "minitest"
 
 eval_gemfile File.expand_path("../gemfiles/#{version}.gemfile", __FILE__)

data/README.markdown

@@ -569,11 +569,11 @@ require 'activerecord-import'
 ### Load Path Setup
 To understand how rubygems loads code you can reference the following:
 
-  http://guides.rubygems.org/patterns/#loading-code
+  https://guides.rubygems.org/patterns/#loading-code
 
 And an example of how active_record dynamically load adapters:
 
-  https://github.com/rails/rails/blob/master/activerecord/lib/active_record/connection_adapters/connection_specification.rb
+  https://github.com/rails/rails/blob/main/activerecord/lib/active_record/connection_adapters.rb
 
 In summary, when a gem is loaded rubygems adds the `lib` folder of the gem to the global load path `$LOAD_PATH` so that all `require` lookups will not propagate through all of the folders on the load path. When a `require` is issued each folder on the `$LOAD_PATH` is checked for the file and/or folder referenced. This allows a gem (like activerecord-import) to define push the activerecord-import folder (or namespace) on the `$LOAD_PATH` and any adapters provided by activerecord-import will be found by rubygems when the require is issued.
 

data/benchmarks/benchmark.rb

@@ -44,8 +44,6 @@ require adapter_schema if File.exist?(adapter_schema)
 Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 
 require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
-
-table_types = nil
 table_types = if options.benchmark_all_types
   ["all"]
 else

data/benchmarks/lib/base.rb

@@ -16,7 +16,7 @@ class BenchmarkBase
     end
   end
 
-  # Returns an OpenStruct which contains two attritues, +description+ and +tms+ after performing an
+  # Returns a struct which contains two attritues, +description+ and +tms+ after performing an
   # actual benchmark.
   #
   # == PARAMETERS
@@ -24,9 +24,12 @@ class BenchmarkBase
   #  * blk - the block of code to benchmark
   #
   # == RETURNS
-  # An OpenStruct object with the following attributes:
+  # A struct object with the following attributes:
   #   * description - the description of the benchmark ran
   #   * tms - a Benchmark::Tms containing the results of the benchmark
+
+  BmStruct = Struct.new( :description, :tms, :failed, keyword_init: true )
+
   def bm( description, &block )
     tms = nil
     puts "Benchmarking #{description}"
@@ -35,7 +38,7 @@ class BenchmarkBase
     delete_all
     failed = false
 
-    OpenStruct.new description: description, tms: tms, failed: failed
+    BmStruct.new( description: description, tms: tms, failed: failed )
   end
 
   # Given a model class (ie: Topic), and an array of columns and value sets

data/benchmarks/lib/cli_parser.rb

@@ -1,7 +1,6 @@
 # frozen_string_literal: true
 
 require 'optparse'
-require 'ostruct'
 
 #
 # == PARAMETERS
@@ -10,7 +9,7 @@ require 'ostruct'
 # * t - the table types to test. ie: myisam, innodb, memory, temporary, etc.
 #
 module BenchmarkOptionParser
-  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options.".freeze
 
   def self.print_banner
     puts BANNER
@@ -38,8 +37,11 @@ module BenchmarkOptionParser
     end
   end
 
+  OptionsStruct = Struct.new( :adapter, :table_types, :delete_on_finish, :number_of_objects, :outputs,
+                              :benchmark_all_types, keyword_init: true )
+  OutputStruct = Struct.new( :format, :filename, keyword_init: true )
   def self.parse( args )
-    options = OpenStruct.new(
+    options = OptionsStruct.new(
       adapter: 'mysql2',
       table_types: {},
       delete_on_finish: true,
@@ -81,12 +83,12 @@ module BenchmarkOptionParser
 
       # print results in CSV format
       opts.on( "--to-csv [String]", "Print results in a CSV file format" ) do |filename|
-        options.outputs << OpenStruct.new( format: 'csv', filename: filename)
+        options.outputs << OutputStruct.new( format: 'csv', filename: filename)
       end
 
       # print results in HTML format
       opts.on( "--to-html [String]", "Print results in HTML format" ) do |filename|
-        options.outputs << OpenStruct.new( format: 'html', filename: filename )
+        options.outputs << OutputStruct.new( format: 'html', filename: filename )
       end
     end # end opt.parse!
 
@@ -100,7 +102,7 @@ module BenchmarkOptionParser
     end
 
     options.number_of_objects = [1000] if options.number_of_objects.empty?
-    options.outputs = [OpenStruct.new( format: 'html', filename: 'benchmark.html')] if options.outputs.empty?
+    options.outputs = [OutputStruct.new( format: 'html', filename: 'benchmark.html')] if options.outputs.empty?
 
     print_options( options )
 

data/gemfiles/8.0.gemfile

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+gem 'activerecord', '~> 8.0.0'

data/lib/activerecord-import/import.rb

@@ -1,7 +1,5 @@
 # frozen_string_literal: true
 
-require "ostruct"
-
 module ActiveRecord::Import::ConnectionAdapters; end
 
 module ActiveRecord::Import # :nodoc:
@@ -94,7 +92,7 @@ module ActiveRecord::Import # :nodoc:
             env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
             if runner.respond_to?(:call) # ActiveRecord < 5.1
               runner.call(env)
-            else # ActiveRecord 5.1
+            else # ActiveRecord >= 5.1
               # Note that this is a gross simplification of ActiveSupport::Callbacks#run_callbacks.
               # It's technically possible for there to exist an "around" callback in the
               # :validate chain, but this would be an aberration, since Rails doesn't define
@@ -107,7 +105,8 @@ module ActiveRecord::Import # :nodoc:
               # no real-world use case for it.
               raise "The :validate callback chain contains an 'around' callback, which is unsupported" unless runner.final?
               runner.invoke_before(env)
-              runner.invoke_after(env)
+              # Ensure a truthy value is returned. ActiveRecord < 7.2 always returned an array.
+              runner.invoke_after(env) || []
             end
           elsif @validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
             model.instance_eval @validate_callbacks.compile
@@ -858,12 +857,11 @@ class ActiveRecord::Base
 
     private
 
-    def associated_options(options, associated_class)
+    def associated_options(options, association)
       return options unless options.key?(:recursive_on_duplicate_key_update)
 
-      table_name = associated_class.arel_table.name.to_sym
       options.merge(
-        on_duplicate_key_update: options[:recursive_on_duplicate_key_update][table_name]
+        on_duplicate_key_update: options[:recursive_on_duplicate_key_update][association]
       )
     end
 
@@ -972,12 +970,12 @@ class ActiveRecord::Base
       options.delete(:returning)
 
       associated_objects_by_class.each_value do |associations|
-        associations.each_value do |associated_records|
+        associations.each do |association, associated_records|
           next if associated_records.empty?
 
           associated_class = associated_records.first.class
           associated_class.bulk_import(associated_records,
-                                       associated_options(options, associated_class))
+                                       associated_options(options, association))
         end
       end
     end

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.8.0"
+    VERSION = "2.0.0"
   end
 end

data/test/github/database.yml

@@ -3,7 +3,7 @@ common: &common
   password: root
   encoding: utf8
   collation: utf8_general_ci
-  host:     localhost
+  host: 127.0.0.1
   database: activerecord_import_test
 
 jdbcpostgresql: &postgresql
@@ -54,7 +54,7 @@ seamless_database_pool:
   pool_adapter: mysql2
   prepared_statements: false
   master:
-    host: localhost
+    host: 127.0.0.1
 
 sqlite:
   adapter: sqlite

data/test/import_test.rb

@@ -741,14 +741,8 @@ describe "#import" do
       ]
       Book.import books
       assert_equal 2, Book.count
-
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-        assert_equal 'published', Book.last.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-        assert_equal 1, Book.last.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
 
     it 'should be able to import enum fields with default value' do
@@ -758,32 +752,19 @@ describe "#import" do
       ]
       Book.import books
       assert_equal 1, Book.count
-
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
     end
 
-    if ENV['AR_VERSION'].to_f > 4.1
-      it 'should be able to import enum fields by name' do
-        Book.delete_all if Book.count > 0
-        books = [
-          Book.new(author_name: "Foo", title: "Baz", status: :draft),
-          Book.new(author_name: "Foo2", title: "Baz2", status: :published),
-        ]
-        Book.import books
-        assert_equal 2, Book.count
-
-        if ENV['AR_VERSION'].to_i >= 5.0
-          assert_equal 'draft', Book.first.read_attribute('status')
-          assert_equal 'published', Book.last.read_attribute('status')
-        else
-          assert_equal 0, Book.first.read_attribute('status')
-          assert_equal 1, Book.last.read_attribute('status')
-        end
-      end
+    it 'should be able to import enum fields by name' do
+      Book.delete_all if Book.count > 0
+      books = [
+        Book.new(author_name: "Foo", title: "Baz", status: :draft),
+        Book.new(author_name: "Foo2", title: "Baz2", status: :published),
+      ]
+      Book.import books
+      assert_equal 2, Book.count
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
   end
 
@@ -796,13 +777,8 @@ describe "#import" do
       Book.import columns, values
       assert_equal 2, Book.count
 
-      if ENV['AR_VERSION'].to_i >= 5.0
-        assert_equal 'draft', Book.first.read_attribute('status')
-        assert_equal 'published', Book.last.read_attribute('status')
-      else
-        assert_equal 0, Book.first.read_attribute('status')
-        assert_equal 1, Book.last.read_attribute('status')
-      end
+      assert_equal 'draft', Book.first.read_attribute('status')
+      assert_equal 'published', Book.last.read_attribute('status')
     end
   end
 

data/test/models/author.rb

@@ -1,7 +1,9 @@
 # frozen_string_literal: true
 
 class Author < ActiveRecord::Base
-  if ENV['AR_VERSION'].to_f >= 7.1
+  if ENV['AR_VERSION'].to_f >= 8.0
+    has_many :composite_books, foreign_key: [:id, :author_id], inverse_of: :author
+  elsif ENV['AR_VERSION'].to_f >= 7.1
     has_many :composite_books, query_constraints: [:id, :author_id], inverse_of: :author
   end
 end

data/test/models/book.rb

@@ -2,7 +2,7 @@
 
 class Book < ActiveRecord::Base
   belongs_to :topic, inverse_of: :books
-  if ENV['AR_VERSION'].to_f <= 7.0
+  if ENV['AR_VERSION'].to_f <= 7.0 || ENV['AR_VERSION'].to_f >= 8.0
     belongs_to :tag, foreign_key: [:tag_id, :parent_id] unless ENV["SKIP_COMPOSITE_PK"]
   else
     belongs_to :tag, query_constraints: [:tag_id, :parent_id] unless ENV["SKIP_COMPOSITE_PK"]
@@ -10,5 +10,9 @@ class Book < ActiveRecord::Base
   has_many :chapters, inverse_of: :book
   has_many :discounts, as: :discountable
   has_many :end_notes, inverse_of: :book
-  enum status: [:draft, :published] if ENV['AR_VERSION'].to_f >= 4.1
+  if ENV['AR_VERSION'].to_f >= 8.0
+    enum :status, [:draft, :published]
+  else
+    enum status: [:draft, :published]
+  end
 end

data/test/models/composite_book.rb

@@ -3,7 +3,7 @@
 class CompositeBook < ActiveRecord::Base
   self.primary_key = %i[id author_id]
   belongs_to :author
-  if ENV['AR_VERSION'].to_f <= 7.0
+  if ENV['AR_VERSION'].to_f <= 7.0 || ENV['AR_VERSION'].to_f >= 8.0
     unless ENV["SKIP_COMPOSITE_PK"]
       has_many :composite_chapters, inverse_of: :composite_book,
                                     foreign_key: [:id, :author_id]

data/test/models/composite_chapter.rb

@@ -1,7 +1,10 @@
 # frozen_string_literal: true
 
 class CompositeChapter < ActiveRecord::Base
-  if ENV['AR_VERSION'].to_f >= 7.1
+  if ENV['AR_VERSION'].to_f >= 8.0
+    belongs_to :composite_book, inverse_of: :composite_chapters,
+                                foreign_key: [:composite_book_id, :author_id]
+  elsif ENV['AR_VERSION'].to_f >= 7.1
     belongs_to :composite_book, inverse_of: :composite_chapters,
                                 query_constraints: [:composite_book_id, :author_id]
   end

data/test/models/customer.rb

@@ -2,7 +2,7 @@
 
 class Customer < ActiveRecord::Base
   unless ENV["SKIP_COMPOSITE_PK"]
-    if ENV['AR_VERSION'].to_f <= 7.0
+    if ENV['AR_VERSION'].to_f <= 7.0 || ENV['AR_VERSION'].to_f >= 8.0
       has_many :orders,
                inverse_of: :customer,
                primary_key: %i(account_id id),

data/test/models/order.rb

@@ -2,7 +2,7 @@
 
 class Order < ActiveRecord::Base
   unless ENV["SKIP_COMPOSITE_PK"]
-    if ENV['AR_VERSION'].to_f <= 7.0
+    if ENV['AR_VERSION'].to_f <= 7.0 || ENV['AR_VERSION'].to_f >= 8.0
       belongs_to :customer,
                  inverse_of: :orders,
                  primary_key: %i(account_id id),

data/test/models/tag_alias.rb

@@ -2,7 +2,7 @@
 
 class TagAlias < ActiveRecord::Base
   unless ENV["SKIP_COMPOSITE_PK"]
-    if ENV['AR_VERSION'].to_f <= 7.0
+    if ENV['AR_VERSION'].to_f <= 7.0 || ENV['AR_VERSION'].to_f >= 8.0
       belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
     else
       belongs_to :tag, query_constraints: [:tag_id, :parent_id], required: true

data/test/models/topic.rb

@@ -16,6 +16,7 @@ class Topic < ActiveRecord::Base
   before_validation -> { errors.add(:title, :invalid) if title == 'invalid' }
 
   has_many :books, inverse_of: :topic
+  has_many :novels, inverse_of: :topic, class_name: "Book"
   belongs_to :parent, class_name: "Topic"
 
   composed_of :description, mapping: [%w(title title), %w(author_name author_name)], allow_nil: true, class_name: "TopicDescription"

data/test/support/active_support/test_case_extensions.rb

@@ -3,11 +3,7 @@
 class ActiveSupport::TestCase
   include ActiveRecord::TestFixtures
 
-  if ENV['AR_VERSION'].to_f >= 5.0
-    self.use_transactional_tests = true
-  else
-    self.use_transactional_fixtures = true
-  end
+  self.use_transactional_tests = true
 
   class << self
     def requires_active_record_version(version_string, &blk)

data/test/support/mysql/import_examples.rb

@@ -84,14 +84,12 @@ def should_support_mysql_import_functionality
       end
     end
 
-    if ENV['AR_VERSION'].to_f >= 5.1
-      context "with virtual columns" do
-        let(:books) { [Book.new(author_name: "foo", title: "bar")] }
-
-        it "ignores virtual columns and creates record" do
-          assert_difference "Book.count", +1 do
-            Book.import books
-          end
+    context "with virtual columns" do
+      let(:books) { [Book.new(author_name: "foo", title: "bar")] }
+
+      it "ignores virtual columns and creates record" do
+        assert_difference "Book.count", +1 do
+          Book.import books
         end
       end
     end

data/test/support/postgresql/import_examples.rb

@@ -38,10 +38,8 @@ def should_support_postgresql_import_functionality
         assert !topic.changed?
       end
 
-      if ENV['AR_VERSION'].to_f > 4.1
-        it "moves the dirty changes to previous_changes" do
-          assert topic.previous_changes.present?
-        end
+      it "moves the dirty changes to previous_changes" do
+        assert topic.previous_changes.present?
       end
 
       it "marks models as persisted" do
@@ -96,15 +94,9 @@ def should_support_postgresql_import_functionality
     describe "returning" do
       let(:books) { [Book.new(author_name: "King", title: "It")] }
       let(:result) { Book.import(books, returning: %w(author_name title)) }
-      let(:book_id) do
-        if RUBY_PLATFORM == 'java' || ENV['AR_VERSION'].to_i >= 5.0
-          books.first.id
-        else
-          books.first.id.to_s
-        end
-      end
-      let(:true_returning_value) { ENV['AR_VERSION'].to_f >= 5.0 ? true : 't' }
-      let(:false_returning_value) { ENV['AR_VERSION'].to_f >= 5.0 ? false : 'f' }
+      let(:book_id) { books.first.id }
+      let(:true_returning_value) { true }
+      let(:false_returning_value) { false }
 
       it "creates records" do
         assert_difference("Book.count", +1) { result }
@@ -222,23 +214,21 @@ def should_support_postgresql_import_functionality
     end
   end
 
-  if ENV['AR_VERSION'].to_f >= 4.0
-    describe "with a uuid primary key" do
-      let(:vendor) { Vendor.new(name: "foo") }
-      let(:vendors) { [vendor] }
+  describe "with a uuid primary key" do
+    let(:vendor) { Vendor.new(name: "foo") }
+    let(:vendors) { [vendor] }
 
-      it "creates records" do
-        assert_difference "Vendor.count", +1 do
-          Vendor.import vendors
-        end
-      end
-
-      it "assigns an id to the model objects" do
+    it "creates records" do
+      assert_difference "Vendor.count", +1 do
         Vendor.import vendors
-        assert_not_nil vendor.id
       end
     end
 
+    it "assigns an id to the model objects" do
+      Vendor.import vendors
+      assert_not_nil vendor.id
+    end
+
     describe "with an assigned uuid primary key" do
       let(:id) { SecureRandom.uuid }
       let(:vendor) { Vendor.new(id: id, name: "foo") }
@@ -254,44 +244,38 @@ def should_support_postgresql_import_functionality
   end
 
   describe "with store accessor fields" do
-    if ENV['AR_VERSION'].to_f >= 4.0
-      it "imports values for json fields" do
-        vendors = [Vendor.new(name: 'Vendor 1', size: 100)]
-        assert_difference "Vendor.count", +1 do
-          Vendor.import vendors
-        end
-        assert_equal(100, Vendor.first.size)
+    it "imports values for json fields" do
+      vendors = [Vendor.new(name: 'Vendor 1', size: 100)]
+      assert_difference "Vendor.count", +1 do
+        Vendor.import vendors
       end
+      assert_equal(100, Vendor.first.size)
+    end
 
-      it "imports values for hstore fields" do
-        vendors = [Vendor.new(name: 'Vendor 1', contact: 'John Smith')]
-        assert_difference "Vendor.count", +1 do
-          Vendor.import vendors
-        end
-        assert_equal('John Smith', Vendor.first.contact)
+    it "imports values for hstore fields" do
+      vendors = [Vendor.new(name: 'Vendor 1', contact: 'John Smith')]
+      assert_difference "Vendor.count", +1 do
+        Vendor.import vendors
       end
+      assert_equal('John Smith', Vendor.first.contact)
     end
 
-    if ENV['AR_VERSION'].to_f >= 4.2
-      it "imports values for jsonb fields" do
-        vendors = [Vendor.new(name: 'Vendor 1', charge_code: '12345')]
-        assert_difference "Vendor.count", +1 do
-          Vendor.import vendors
-        end
-        assert_equal('12345', Vendor.first.charge_code)
+    it "imports values for jsonb fields" do
+      vendors = [Vendor.new(name: 'Vendor 1', charge_code: '12345')]
+      assert_difference "Vendor.count", +1 do
+        Vendor.import vendors
       end
+      assert_equal('12345', Vendor.first.charge_code)
     end
   end
 
-  if ENV['AR_VERSION'].to_f >= 4.2
-    describe "with serializable fields" do
-      it "imports default values as correct data type" do
-        vendors = [Vendor.new(name: 'Vendor 1')]
-        assert_difference "Vendor.count", +1 do
-          Vendor.import vendors
-        end
-        assert_equal({}, Vendor.first.json_data)
+  describe "with serializable fields" do
+    it "imports default values as correct data type" do
+      vendors = [Vendor.new(name: 'Vendor 1')]
+      assert_difference "Vendor.count", +1 do
+        Vendor.import vendors
       end
+      assert_equal({}, Vendor.first.json_data)
     end
 
     %w(json jsonb).each do |json_type|

data/test/support/shared_examples/recursive_import.rb

@@ -278,6 +278,45 @@ def should_support_recursive_import
           end
           assert_equal new_chapter_title, Chapter.find(example_chapter.id).title
         end
+
+        context "when a non-standard association name is used" do
+          let(:new_topics) do
+            topic = Build(:topic)
+
+            2.times do
+              novel = topic.novels.build(title: FactoryBot.generate(:book_title), author_name: 'Stephen King')
+              3.times do
+                novel.chapters.build(title: FactoryBot.generate(:chapter_title))
+              end
+
+              4.times do
+                novel.end_notes.build(note: FactoryBot.generate(:end_note))
+              end
+            end
+
+            [topic]
+          end
+
+          it "updates nested associated objects" do
+            new_chapter_title = 'The Final Chapter'
+            novel = new_topics.first.novels.first
+            novel.author_name = 'Richard Bachman'
+
+            example_chapter = novel.chapters.first
+            example_chapter.title = new_chapter_title
+
+            assert_nothing_raised do
+              Topic.import new_topics,
+                recursive: true,
+                on_duplicate_key_update: [:id],
+                recursive_on_duplicate_key_update: {
+                  novels: { conflict_target: [:id], columns: [:author_name] },
+                  chapters: { conflict_target: [:id], columns: [:title] }
+                }
+            end
+            assert_equal new_chapter_title, Chapter.find(example_chapter.id).title
+          end
+        end
       end
     end
 

data/test/test_helper.rb

@@ -13,19 +13,16 @@ ENV["RAILS_ENV"] = "test"
 require "bundler"
 Bundler.setup
 
-require 'pry' unless RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /jruby/
+unless RbConfig::CONFIG["RUBY_INSTALL_NAME"] =~ /jruby/
+  require 'pry'
+  require 'pry-byebug'
+end
 
 require "active_record"
 require "active_record/fixtures"
 require "active_support/test_case"
-
-if ActiveSupport::VERSION::STRING < "4.0"
-  require 'test/unit'
-  require 'mocha/test_unit'
-else
-  require 'active_support/testing/autorun'
-  require "mocha/minitest"
-end
+require 'active_support/testing/autorun'
+require "mocha/minitest"
 
 require 'timecop'
 require 'chronic'
@@ -38,16 +35,6 @@ rescue LoadError
   end
 end
 
-# Support MySQL 5.7
-if ActiveSupport::VERSION::STRING < "4.1"
-  require "active_record/connection_adapters/mysql2_adapter"
-  class ActiveRecord::ConnectionAdapters::Mysql2Adapter
-    NATIVE_DATABASE_TYPES[:primary_key] = "int(11) auto_increment PRIMARY KEY"
-  end
-end
-
-require "ruby-debug" if RUBY_VERSION.to_f < 1.9
-
 adapter = ENV["ARE_DB"] || "sqlite3"
 
 FileUtils.mkdir_p 'log'
@@ -99,4 +86,4 @@ Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 # Prevent this deprecation warning from breaking the tests.
 Rake::FileList.send(:remove_method, :import)
 
-ActiveSupport::TestCase.test_order = :random if ENV['AR_VERSION'].to_f >= 4.2
+ActiveSupport::TestCase.test_order = :random

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 1.8.0
+  version: 2.0.0
 platform: ruby
 authors:
 - Zach Dennis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2024-12-10 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -70,15 +70,13 @@ files:
 - benchmarks/models/test_myisam.rb
 - benchmarks/schema/mysql2_schema.rb
 - docker-compose.yml
-- gemfiles/4.2.gemfile
-- gemfiles/5.0.gemfile
-- gemfiles/5.1.gemfile
 - 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
@@ -98,9 +96,6 @@ files:
 - lib/activerecord-import/adapters/trilogy_adapter.rb
 - lib/activerecord-import/base.rb
 - lib/activerecord-import/import.rb
-- lib/activerecord-import/mysql2.rb
-- lib/activerecord-import/postgresql.rb
-- lib/activerecord-import/sqlite3.rb
 - lib/activerecord-import/synchronize.rb
 - lib/activerecord-import/value_sets_parser.rb
 - lib/activerecord-import/version.rb
@@ -187,7 +182,7 @@ licenses:
 - MIT
 metadata:
   changelog_uri: https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -202,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.5.11
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files:

data/gemfiles/4.2.gemfile

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-gem 'activerecord', '~> 4.2.0'
-gem 'composite_primary_keys', '~> 8.0'

data/gemfiles/5.0.gemfile

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-gem 'activerecord', '~> 5.0.0'
-gem 'composite_primary_keys', '~> 9.0'

data/gemfiles/5.1.gemfile

@@ -1,4 +0,0 @@
-# frozen_string_literal: true
-
-gem 'activerecord', '~> 5.1.0'
-gem 'composite_primary_keys', '~> 10.0'

data/lib/activerecord-import/mysql2.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-warn <<-MSG
-[DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
-  is deprecated. Update to autorequire using 'require "activerecord-import"'. See
-  http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
-MSG
-
-require "activerecord-import"

data/lib/activerecord-import/postgresql.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-warn <<-MSG
-[DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
-  is deprecated. Update to autorequire using 'require "activerecord-import"'. See
-  http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
-MSG
-
-require "activerecord-import"

data/lib/activerecord-import/sqlite3.rb

@@ -1,9 +0,0 @@
-# frozen_string_literal: true
-
-warn <<-MSG
-[DEPRECATION] loading activerecord-import via 'require "activerecord-import/<adapter-name>"'
-  is deprecated. Update to autorequire using 'require "activerecord-import"'. See
-  http://github.com/zdennis/activerecord-import/wiki/Requiring for more information
-MSG
-
-require "activerecord-import"