activerecord-import 1.8.0 → 2.2.0

data/test/janus_mysql2/import_test.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+
+require File.expand_path("#{File.dirname(__FILE__)}/../support/assertions")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/mysql/import_examples")
+
+should_support_mysql_import_functionality

data/test/janus_trilogy/import_test.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/assertions")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/mysql/import_examples")
+
+should_support_mysql_import_functionality

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/mysql2_proxy/import_test.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/mysql/import_examples")
+
+should_support_mysql_import_functionality

data/test/postgresql_proxy/import_test.rb

@@ -0,0 +1,6 @@
+# frozen_string_literal: true
+
+require File.expand_path("#{File.dirname(__FILE__)}/../test_helper")
+require File.expand_path("#{File.dirname(__FILE__)}/../support/postgresql/import_examples")
+
+should_support_postgresql_import_functionality

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

@@ -2,6 +2,8 @@
 
 require 'pathname'
 require 'rake'
+require 'logger'
+
 test_dir = Pathname.new File.dirname(__FILE__)
 $LOAD_PATH.unshift(File.join(File.dirname(__FILE__), '..', 'lib'))
 $LOAD_PATH.unshift(File.dirname(__FILE__))
@@ -13,19 +15,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 +37,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 +88,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.2.0
 platform: ruby
 authors:
 - Zach Dennis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2024-08-23 00:00:00.000000000 Z
+date: 2025-05-27 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,22 +96,23 @@ 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
+- 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
@@ -121,6 +120,8 @@ files:
 - 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
@@ -156,9 +157,11 @@ files:
 - 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
@@ -187,7 +190,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,21 +205,25 @@ 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:
+- 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
@@ -224,6 +231,8 @@ test_files:
 - 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
@@ -259,9 +268,11 @@ test_files:
 - 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

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"