activerecord-import 1.5.0 → 1.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 866dd09466fbda981329e13916e89986cb47d65259f0889b8a3b53aeca1aee32
-  data.tar.gz: 258a0d2fc34bbb928500e2f8a83df4f5bdc8901c25e2e123a569c56d587d3f53
+  metadata.gz: d1478b29daf1e757c91a0ca8693bb1b03f9a90daa2fe02f0959576bcec900d85
+  data.tar.gz: dc938a1936c931182675a118ad24a37e2a7c5a27c0419e5bd947e0ec35aa4334
 SHA512:
-  metadata.gz: 989562e1fb64d669a96211c6b80df5b89d8a43aa38575ec6706d0633b405983a63849bd5fb78d4031ed7e4b2c239192f62d4b3d9e720f4c474cd3801600d11ef
-  data.tar.gz: 22e6ccbb750bb7851930d98c2b90f496c759d35503c8c1e58b841f4a928a283c486caec3f22cb57e6948b6960e6fff2a598499f0670f59b281e321dded20c183
+  metadata.gz: e276196113f433c8989a9a06cfad36df650105183a5559a548bdd8a04bd2da22db36ca996d2d0d04c4561b33ceb44559b50b4ad98e0a2d9f050b8084ee99c8e6
+  data.tar.gz: e699052ac2499bac23a9955fef71df853050767785d573523e23a1d216cfba9cb75b81b0db9f5e2afac02afbcb416563af6e7a2bf69f6d1288c6e6c71aeb7e5c

data/.github/workflows/test.yaml

@@ -16,17 +16,50 @@ jobs:
           --health-interval 10s
           --health-timeout 5s
           --health-retries 5
+      mysql:
+        image: mysql:5.7
+        ports:
+          - 3306:3306
+        env:
+          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.2
+          - 3.3
         env:
+          - 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: '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'
@@ -39,6 +72,9 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
+          - ruby: jruby-9.4.5.0
+            env:
+              AR_VERSION: '7.0'
           - ruby: 2.7
             env:
               AR_VERSION: '7.0'
@@ -48,28 +84,23 @@ jobs:
           - ruby: 2.7
             env:
               AR_VERSION: '6.0'
-          - ruby: 2.6
+          - ruby: jruby-9.3.10.0
             env:
-              AR_VERSION: 5.2
+              AR_VERSION: '6.1'
           - ruby: 2.6
             env:
-              AR_VERSION: 5.1
-          - ruby: 2.4
-            env:
-              AR_VERSION: '5.0'
-          - ruby: 2.4
-            env:
-              AR_VERSION: 4.2
+              AR_VERSION: 5.2
     runs-on: ubuntu-latest
     env:
       AR_VERSION: ${{ matrix.env.AR_VERSION }}
       DB_DATABASE: activerecord_import_test
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          rubygems: latest
       - name: Set up databases
         run: |
           sudo /etc/init.d/mysql start
@@ -99,12 +130,15 @@ jobs:
         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
   lint:
     runs-on: ubuntu-latest
     env:
       AR_VERSION: '7.0'
     steps:
-      - uses: actions/checkout@v2
+      - uses: actions/checkout@v4
       - uses: ruby/setup-ruby@v1
         with:
           ruby-version: 2.7

data/.gitignore

@@ -13,12 +13,16 @@ tmtags
 ## VIM
 *.swp
 
+## Idea
+.idea
+
 ## PROJECT::GENERAL
 coverage
 rdoc
 pkg
 *.gem
 *.lock
+.byebug_history
 
 ## PROJECT::SPECIFIC
 log/*.log

data/.rubocop_todo.yml

@@ -24,3 +24,7 @@ Lint/UnusedMethodArgument:
 Style/CombinableLoops:
   Exclude:
     - 'test/support/shared_examples/recursive_import.rb'
+
+Naming/FileName:
+  Exclude:
+    - 'lib/activerecord-import.rb'

data/CHANGELOG.md

@@ -1,3 +1,32 @@
+## Changes in 1.8.0
+
+### New Features
+
+* Add support for ActiveRecord 7.2 via \##845.
+
+## Changes in 1.7.0
+
+### New Features
+
+* Add support for ActiveRecord 7.1 composite primary keys. Thanks to @fragkakis via \##837.
+* Add support for upserting associations when doing recursive imports. Thanks to @ramblex via \##778.
+
+## Changes in 1.6.0
+
+### New Features
+
+* Add trilogy adapter support. Thanks to @zmariscal via \##825.
+
+### Fixes
+
+* Use the locking_enabled? method provided by activerecord to decide whether the lock field should be updated. Thanks to @dombesz via \##822.
+
+## Changes in 1.5.1
+
+### Fixes
+
+* Stop memoizing schema_columns_hash so dynamic schema changes are picked up. Thanks to @koshigoe via \##812.
+
 ## Changes in 1.5.0
 
 ### New Features

data/Dockerfile

@@ -0,0 +1,23 @@
+# Use the official Ruby 3.2 image as a base image
+ARG RUBY_VERSION=3.2
+FROM ruby:${RUBY_VERSION}-bullseye
+
+# Set the working directory
+WORKDIR /usr/src/app
+
+# Install system packages
+RUN apt-get update -qq && \
+    apt-get install -y default-mysql-client postgresql postgresql-contrib vim && \
+    apt-get clean
+
+# Set environment variables
+ENV AR_VERSION=7.0
+
+# Copy all files
+COPY . .
+
+# Move sample database.yml and install gems
+RUN mv test/database.yml.sample test/database.yml && \
+    bundle install
+
+CMD ["irb"]

data/Gemfile

@@ -26,18 +26,26 @@ platforms :ruby do
   gem "sqlite3",                "~> #{sqlite3_version}"
   # seamless_database_pool requires Ruby ~> 2.0
   gem "seamless_database_pool", "~> 1.0.20" if Gem::Version.new(RUBY_VERSION) < Gem::Version.new('3.0.0')
+  gem "trilogy" if version >= 6.0
+  if version >= 6.0 && version <= 7.0
+    gem "activerecord-trilogy-adapter"
+  end
 end
 
 platforms :jruby do
   gem "jdbc-mysql"
   gem "jdbc-postgres"
-  gem "activerecord-jdbcsqlite3-adapter",    "~> 1.3"
-  gem "activerecord-jdbcmysql-adapter",      "~> 1.3"
-  gem "activerecord-jdbcpostgresql-adapter", "~> 1.3"
+  gem "activerecord-jdbcsqlite3-adapter"
+  gem "activerecord-jdbcmysql-adapter"
+  gem "activerecord-jdbcpostgresql-adapter"
 end
 
 # Support libs
-gem "factory_bot"
+if Gem::Version.new(RUBY_VERSION) >= Gem::Version.new("3.0.0")
+  gem "factory_bot"
+else
+  gem "factory_bot", "~> 5", "< 6.4.5"
+end
 gem "timecop"
 gem "chronic"
 gem "mocha", "~> 2.1.0"

data/README.markdown

@@ -265,7 +265,7 @@ Book.import books, recursive: true
 Key                       | Options               | Default            | Description
 ------------------------- | --------------------- | ------------------ | -----------
 :validate                 | `true`/`false`        | `true`             | Whether or not to run `ActiveRecord` validations (uniqueness skipped). This option will always be true when using `import!`.
-:validate_uniqueness      | `true`/`false`        | `false`            | Whether or not to run uniqueness validations, has potential pitfalls, use with caution (requires `>= v0.27.0`).
+:validate_uniqueness      | `true`/`false`        | `false`            | Whether or not to run ActiveRecord uniqueness validations. Beware this will incur an sql query per-record (N+1 queries). (requires `>= v0.27.0`).
 :validate_with_context    | `Symbol`              |`:create`/`:update` | Allows passing an ActiveModel validation context for each model. Default is `:create` for new records and `:update` for existing ones.
 :track_validation_failures| `true`/`false`        | `false`            | When this is set to true, `failed_instances` will be an array of arrays, with each inner array having the form `[:index_in_dataset, :object_with_errors]`
 :on_duplicate_key_ignore  | `true`/`false`        | `false`            | Allows skipping records with duplicate keys. See [here](#duplicate-key-ignore) for more details.
@@ -274,6 +274,7 @@ Key                       | Options               | Default            | Descrip
 :synchronize              | `Array`               | N/A                | An array of ActiveRecord instances. This synchronizes existing instances in memory with updates from the import.
 :timestamps               | `true`/`false`        | `true`             | Enables/disables timestamps on imported records.
 :recursive                | `true`/`false`        | `false`            | Imports has_many/has_one associations (PostgreSQL only).
+:recursive_on_duplicate_key_update | `Hash`       | N/A                | Allows upsert logic to be used for recursive associations. The hash key is the association name and the value has the same options as `:on_duplicate_key_update`. See [here](#duplicate-key-update) for more details.
 :batch_size               | `Integer`             | total # of records | Max number of records to insert per import
 :raise_error              | `true`/`false`        | `false`            | Raises an exception at the first invalid record. This means there will not be a result object returned. The `import!` method is a shortcut for this.
 :all_or_none              | `true`/`false`        | `false`            | Will not import any records if there is a record with validation errors.
@@ -364,6 +365,29 @@ book.reload.title  # => "Book1"      (stayed the same)
 book.reload.author # => "Bob Barker" (changed)
 ```
 
+PostgreSQL Using partial indexes
+
+```ruby
+book = Book.create! title: "Book1", author: "George Orwell", published_at: Time.now
+book.author = "Bob Barker"
+
+# in migration
+execute <<-SQL
+      CREATE INDEX books_published_at_index ON books (published_at) WHERE published_at IS NOT NULL;
+    SQL
+
+# PostgreSQL version
+Book.import [book], on_duplicate_key_update: {
+  conflict_target: [:id],
+  index_predicate: "published_at IS NOT NULL",
+  columns: [:author]
+}
+
+book.reload.title  # => "Book1"          (stayed the same)
+book.reload.author # => "Bob Barker"     (changed)
+book.reload.published_at # => 2017-10-09 (stayed the same)
+```
+
 PostgreSQL Using constraints
 
 ```ruby
@@ -626,6 +650,19 @@ AR_VERSION=7.0 bundle exec rake test:postgresql test:sqlite3 test:mysql2
 
 Once you have pushed up your changes, you can find your CI results [here](https://github.com/zdennis/activerecord-import/actions).
 
+#### Docker Setup
+
+Before you begin, make sure you have [Docker](https://www.docker.com/products/docker-desktop/) and [Docker Compose](https://docs.docker.com/compose/) installed on your machine. If you don't, you can install both via Homebrew using the following command:
+
+```bash
+brew install docker && brew install docker-compose
+```
+##### Steps
+
+1. In your terminal run `docker-compose up --build`
+1. In another tab/window run `docker-compose exec app bash`
+1. In that same terminal run the mysql2 test by running `bundle exec rake test:mysql2`
+
 ## Issue Triage [![Open Source Helpers](https://www.codetriage.com/zdennis/activerecord-import/badges/users.svg)](https://www.codetriage.com/zdennis/activerecord-import)
 
 You can triage issues which may include reproducing bug reports or asking for vital information, such as version numbers or reproduction instructions. If you would like to start triaging issues, one easy way to get started is to [subscribe to activerecord-import on CodeTriage](https://www.codetriage.com/zdennis/activerecord-import).

data/Rakefile

@@ -29,6 +29,7 @@ ADAPTERS = %w(
   sqlite3
   spatialite
   seamless_database_pool
+  trilogy
 ).freeze
 ADAPTERS.each do |adapter|
   namespace :test do

data/activerecord-import.gemspec

@@ -10,6 +10,10 @@ Gem::Specification.new do |gem|
   gem.homepage      = "https://github.com/zdennis/activerecord-import"
   gem.license       = "MIT"
 
+  gem.metadata = {
+    "changelog_uri" => "https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md"
+  }
+
   gem.files         = `git ls-files`.split($\)
   gem.executables   = gem.files.grep(%r{^bin/}).map { |f| File.basename(f) }
   gem.test_files    = gem.files.grep(%r{^(test|spec|features)/})

data/docker-compose.yml

@@ -0,0 +1,34 @@
+version: "3.5"
+
+services:
+  mysql:
+    platform: linux/x86_64
+    image: mysql:5.7
+    volumes:
+      - mysql-data:/var/lib/mysql
+    ports:
+      - "3306:3306"
+
+  postgresql:
+    image: postgres:latest
+    volumes:
+      - postgresql-data:/var/lib/postgresql/data
+    ports:
+      - "5432:5432"
+
+  app:
+    build:
+      context: .
+    environment:
+      DB_HOST: mysql
+      AR_VERSION: 7.0
+    volumes:
+      - .:/usr/src/app
+    depends_on:
+      - mysql
+      - postgresql
+    command: tail -f /dev/null
+
+volumes:
+  mysql-data:
+  postgresql-data:

data/gemfiles/7.1.gemfile

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

data/gemfiles/7.2.gemfile

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

data/lib/activerecord-import/active_record/adapters/trilogy_adapter.rb

@@ -0,0 +1,8 @@
+# frozen_string_literal: true
+
+require "active_record/connection_adapters/trilogy_adapter"
+require "activerecord-import/adapters/trilogy_adapter"
+
+class ActiveRecord::ConnectionAdapters::TrilogyAdapter
+  include ActiveRecord::Import::TrilogyAdapter
+end

data/lib/activerecord-import/adapters/trilogy_adapter.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+require "activerecord-import/adapters/mysql_adapter"
+
+module ActiveRecord::Import::TrilogyAdapter
+  include ActiveRecord::Import::MysqlAdapter
+end

data/lib/activerecord-import/import.rb

@@ -62,6 +62,7 @@ module ActiveRecord::Import # :nodoc:
         if @validate_callbacks.respond_to?(:chain, true)
           @validate_callbacks.send(:chain).tap do |chain|
             callback.instance_variable_set(:@filter, filter)
+            callback.instance_variable_set(:@compiled, nil)
             chain[i] = callback
           end
         else
@@ -557,7 +558,7 @@ class ActiveRecord::Base
       options.merge!( args.pop ) if args.last.is_a? Hash
       # making sure that current model's primary key is used
       options[:primary_key] = primary_key
-      options[:locking_column] = locking_column if attribute_names.include?(locking_column)
+      options[:locking_column] = locking_column if locking_enabled?
 
       is_validating = options[:validate_with_context].present? ? true : options[:validate]
       validator = ActiveRecord::Import::Validator.new(self, options)
@@ -857,6 +858,15 @@ class ActiveRecord::Base
 
     private
 
+    def associated_options(options, associated_class)
+      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]
+      )
+    end
+
     def set_attributes_and_mark_clean(models, import_result, timestamps, options)
       return if models.nil?
       models -= import_result.failed_instances
@@ -941,7 +951,7 @@ class ActiveRecord::Base
           association = association.target
           next if association.blank? || model.public_send(column_name).present?
 
-          association_primary_key = Array(association_reflection.association_primary_key)[column_index]
+          association_primary_key = Array(association_reflection.association_primary_key.tr("[]:", "").split(", "))[column_index]
           model.public_send("#{column_name}=", association.send(association_primary_key))
         end
       end
@@ -963,13 +973,17 @@ class ActiveRecord::Base
 
       associated_objects_by_class.each_value do |associations|
         associations.each_value do |associated_records|
-          associated_records.first.class.bulk_import(associated_records, options) unless associated_records.empty?
+          next if associated_records.empty?
+
+          associated_class = associated_records.first.class
+          associated_class.bulk_import(associated_records,
+                                       associated_options(options, associated_class))
         end
       end
     end
 
     def schema_columns_hash
-      @schema_columns_hash ||= if respond_to?(:ignored_columns) && ignored_columns.any?
+      if respond_to?(:ignored_columns) && ignored_columns.any?
         connection.schema_cache.columns_hash(table_name)
       else
         columns_hash
@@ -996,7 +1010,10 @@ class ActiveRecord::Base
 
         changed_objects = association.select { |a| a.new_record? || a.changed? }
         changed_objects.each do |child|
-          child.public_send("#{association_reflection.foreign_key}=", model.id)
+          Array(association_reflection.inverse_of&.foreign_key || association_reflection.foreign_key).each_with_index do |column, index|
+            child.public_send("#{column}=", Array(model.id)[index])
+          end
+
           # For polymorphic associations
           association_name = if model.class.respond_to?(:polymorphic_name)
             model.class.polymorphic_name

data/lib/activerecord-import/version.rb

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

data/lib/activerecord-import.rb

@@ -1,4 +1,3 @@
-# rubocop:disable Naming/FileName
 # frozen_string_literal: true
 
 require "active_support/lazy_load_hooks"

data/test/adapters/trilogy.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "trilogy"
+
+if ENV['AR_VERSION'].to_f <= 7.0
+  require "activerecord-trilogy-adapter"
+  require "trilogy_adapter/connection"
+  ActiveRecord::Base.extend TrilogyAdapter::Connection
+end

data/test/database.yml.sample

@@ -8,6 +8,7 @@ common: &common
 mysql2: &mysql2
   <<: *common
   adapter: mysql2
+  host: mysql
 
 mysql2spatial:
   <<: *mysql2
@@ -19,6 +20,7 @@ postgresql: &postgresql
   <<: *common
   username: postgres
   adapter: postgresql
+  host: postgresql
   min_messages: warning
 
 postresql_makara:
@@ -50,3 +52,8 @@ sqlite3: &sqlite3
 
 spatialite:
   <<: *sqlite3
+
+trilogy:
+  <<: *common
+  adapter: trilogy
+  host: mysql

data/test/github/database.yml

@@ -66,3 +66,7 @@ sqlite3: &sqlite3
 
 spatialite:
   <<: *sqlite3
+
+trilogy:
+  <<: *common
+  adapter: trilogy

data/test/models/author.rb

@@ -0,0 +1,7 @@
+# frozen_string_literal: true
+
+class Author < ActiveRecord::Base
+  if 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,8 +2,11 @@
 
 class Book < ActiveRecord::Base
   belongs_to :topic, inverse_of: :books
-  belongs_to :tag, foreign_key: [:tag_id, :parent_id]
-
+  if ENV['AR_VERSION'].to_f <= 7.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"]
+  end
   has_many :chapters, inverse_of: :book
   has_many :discounts, as: :discountable
   has_many :end_notes, inverse_of: :book

data/test/models/composite_book.rb

@@ -0,0 +1,19 @@
+# frozen_string_literal: true
+
+class CompositeBook < ActiveRecord::Base
+  self.primary_key = %i[id author_id]
+  belongs_to :author
+  if ENV['AR_VERSION'].to_f <= 7.0
+    unless ENV["SKIP_COMPOSITE_PK"]
+      has_many :composite_chapters, inverse_of: :composite_book,
+                                    foreign_key: [:id, :author_id]
+    end
+  else
+    has_many :composite_chapters, inverse_of: :composite_book,
+                                  query_constraints: [:id, :author_id]
+  end
+
+  def self.sequence_name
+    "composite_book_id_seq"
+  end
+end

data/test/models/composite_chapter.rb

@@ -0,0 +1,9 @@
+# frozen_string_literal: true
+
+class CompositeChapter < ActiveRecord::Base
+  if ENV['AR_VERSION'].to_f >= 7.1
+    belongs_to :composite_book, inverse_of: :composite_chapters,
+                                query_constraints: [:composite_book_id, :author_id]
+  end
+  validates :title, presence: true
+end

data/test/models/customer.rb

@@ -1,8 +1,18 @@
 # frozen_string_literal: true
 
 class Customer < ActiveRecord::Base
-  has_many :orders,
-    inverse_of: :customer,
-    primary_key: %i(account_id id),
-    foreign_key: %i(account_id customer_id)
+  unless ENV["SKIP_COMPOSITE_PK"]
+    if ENV['AR_VERSION'].to_f <= 7.0
+      has_many :orders,
+               inverse_of: :customer,
+               primary_key: %i(account_id id),
+               foreign_key: %i(account_id customer_id)
+    else
+      has_many :orders,
+               inverse_of: :customer,
+               primary_key: %i(account_id id),
+               query_constraints: %i(account_id customer_id)
+    end
+
+  end
 end

data/test/models/order.rb

@@ -1,8 +1,17 @@
 # frozen_string_literal: true
 
 class Order < ActiveRecord::Base
-  belongs_to :customer,
-    inverse_of: :orders,
-    primary_key: %i(account_id id),
-    foreign_key: %i(account_id customer_id)
+  unless ENV["SKIP_COMPOSITE_PK"]
+    if ENV['AR_VERSION'].to_f <= 7.0
+      belongs_to :customer,
+                 inverse_of: :orders,
+                 primary_key: %i(account_id id),
+                 foreign_key: %i(account_id customer_id)
+    else
+      belongs_to :customer,
+                 inverse_of: :orders,
+                 primary_key: %i(account_id id),
+                 query_constraints: %i(account_id customer_id)
+    end
+  end
 end

data/test/models/tag.rb

@@ -1,7 +1,12 @@
 # frozen_string_literal: true
 
 class Tag < ActiveRecord::Base
-  self.primary_keys = :tag_id, :publisher_id unless ENV["SKIP_COMPOSITE_PK"]
+  if ENV['AR_VERSION'].to_f <= 7.0
+    self.primary_keys = :tag_id, :publisher_id unless ENV["SKIP_COMPOSITE_PK"]
+  else
+    self.primary_key = [:tag_id, :publisher_id] unless ENV["SKIP_COMPOSITE_PK"]
+  end
+  self.primary_key = [:tag_id, :publisher_id] unless ENV["SKIP_COMPOSITE_PK"]
   has_many :books, inverse_of: :tag
   has_many :tag_aliases, inverse_of: :tag
 end

data/test/models/tag_alias.rb

@@ -1,5 +1,11 @@
 # frozen_string_literal: true
 
 class TagAlias < ActiveRecord::Base
-  belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
+  unless ENV["SKIP_COMPOSITE_PK"]
+    if ENV['AR_VERSION'].to_f <= 7.0
+      belongs_to :tag, foreign_key: [:tag_id, :parent_id], required: true
+    else
+      belongs_to :tag, query_constraints: [:tag_id, :parent_id], required: true
+    end
+  end
 end

data/test/models/topic.rb

@@ -1,7 +1,7 @@
 # frozen_string_literal: true
 
 class Topic < ActiveRecord::Base
-  if ENV['AR_VERSION'].to_i >= 6.0
+  if ENV['AR_VERSION'].to_f >= 6.0
     self.ignored_columns = [:priority]
   end
   alias_attribute :name, :title

data/test/models/widget.rb

@@ -19,8 +19,15 @@ class Widget < ActiveRecord::Base
 
   default_scope -> { where(active: true) }
 
-  serialize :data, Hash
-  serialize :json_data, JSON
+  if ENV['AR_VERSION'].to_f >= 7.1
+    serialize :data, coder: YAML
+    serialize :json_data, coder: JSON
+    serialize :custom_data, coder: CustomCoder.new
+  else
+    serialize :data, Hash
+    serialize :json_data, JSON
+    serialize :custom_data, CustomCoder.new
+  end
+
   serialize :unspecified_data
-  serialize :custom_data, CustomCoder.new
 end

data/test/schema/generic_schema.rb

@@ -2,8 +2,10 @@
 
 ActiveRecord::Schema.define do
   create_table :schema_info, force: :cascade do |t|
-    t.integer :version, unique: true
+    t.integer :version
   end
+  add_index :schema_info, :version, unique: true
+
   SchemaInfo.create version: SchemaInfo::VERSION
 
   create_table :group, force: :cascade do |t|

data/test/schema/postgresql_schema.rb

@@ -8,10 +8,7 @@ ActiveRecord::Schema.define do
   # create ENUM if it does not exist yet
   begin
     execute('CREATE TYPE vendor_type AS ENUM (\'wholesaler\', \'retailer\');')
-  rescue ActiveRecord::StatementInvalid => e
-    # since PostgreSQL does not support IF NOT EXISTS when creating a TYPE,
-    # rescue the error and check the error class
-    raise unless e.cause.is_a? PG::DuplicateObject
+  rescue ActiveRecord::StatementInvalid
     execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'wholesaler\';')
     execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'retailer\';')
   end
@@ -60,4 +57,38 @@ ActiveRecord::Schema.define do
   end
 
   add_index :alarms, [:device_id, :alarm_type], unique: true, where: 'status <> 0'
+
+  unless ENV["SKIP_COMPOSITE_PK"]
+    create_table :authors, force: :cascade do |t|
+      t.string :name
+    end
+
+    execute %(
+      DROP SEQUENCE IF EXISTS composite_book_id_seq CASCADE;
+      CREATE SEQUENCE composite_book_id_seq
+          AS integer
+          START WITH 1
+          INCREMENT BY 1
+          NO MINVALUE
+          NO MAXVALUE
+          CACHE 1;
+
+      DROP TABLE IF EXISTS composite_books;
+      CREATE TABLE composite_books (
+          id bigint DEFAULT nextval('composite_book_id_seq'::regclass) NOT NULL,
+          title character varying,
+          author_id bigint
+       );
+
+      ALTER TABLE ONLY composite_books ADD CONSTRAINT fk_rails_040a418131 FOREIGN KEY (author_id) REFERENCES authors(id);
+    ).split.join(' ').strip
+  end
+
+  create_table :composite_chapters, force: :cascade do |t|
+    t.string :title
+    t.integer :composite_book_id, null: false
+    t.integer :author_id, null: false
+    t.datetime :created_at
+    t.datetime :updated_at
+  end
 end

data/test/support/postgresql/import_examples.rb

@@ -351,6 +351,18 @@ def should_support_postgresql_import_functionality
         assert_equal db_customer.orders.last, db_order
         assert_not_equal db_order.customer_id, nil
       end
+
+      it "should import models with auto-incrementing ID successfully" do
+        author = Author.create!(name: "Foo Barson")
+
+        books = []
+        2.times do |i|
+          books << CompositeBook.new(author_id: author.id, title: "book #{i}")
+        end
+        assert_difference "CompositeBook.count", +2 do
+          CompositeBook.import books
+        end
+      end
     end
   end
 end

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -223,6 +223,34 @@ def should_support_basic_on_duplicate_key_update
           end
         end
       end
+
+      context 'with locking disabled' do
+        it 'does not update the lock_version' do
+          users = [
+            User.new(name: 'Salomon'),
+            User.new(name: 'Nathan')
+          ]
+          User.import(users)
+          assert User.count == users.length
+          User.all.each do |user|
+            assert_equal 0, user.lock_version
+          end
+          updated_users = User.all.map do |user|
+            user.name += ' Rothschild'
+            user
+          end
+
+          ActiveRecord::Base.lock_optimistically = false # Disable locking
+          User.import(updated_users, on_duplicate_key_update: [:name])
+          ActiveRecord::Base.lock_optimistically = true # Enable locking
+
+          assert User.count == updated_users.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, "#{users[i].name} Rothschild"
+            assert_equal 0, user.lock_version
+          end
+        end
+      end
     end
 
     context "with :on_duplicate_key_update" do

data/test/support/shared_examples/recursive_import.rb

@@ -147,7 +147,7 @@ def should_support_recursive_import
       end
 
       books.each do |book|
-        assert_equal book.topic_id, nil
+        assert_nil book.topic_id, nil
       end
     end
 
@@ -165,6 +165,24 @@ def should_support_recursive_import
           assert_equal 1, tags[0].tag_id
           assert_equal 2, tags[1].tag_id
         end
+
+        if ENV['AR_VERSION'].to_f >= 7.1
+          it "should import models with auto-incrementing ID successfully with recursive set to true" do
+            author = Author.create!(name: "Foo Barson")
+            books = []
+            2.times do |i|
+              books << CompositeBook.new(author_id: author.id, title: "Book #{i}", composite_chapters: [
+                                           CompositeChapter.new(title: "Book #{i} composite chapter 1"),
+                                           CompositeChapter.new(title: "Book #{i} composite chapter 2"),
+                                         ])
+            end
+            assert_difference "CompositeBook.count", +2 do
+              assert_difference "CompositeChapter.count", +4 do
+                CompositeBook.import books, recursive: true
+              end
+            end
+          end
+        end
       end
     end
 
@@ -213,6 +231,54 @@ def should_support_recursive_import
           end
         end
       end
+
+      describe "recursive_on_duplicate_key_update" do
+        let(:new_topics) { Build(1, :topic_with_book) }
+
+        setup do
+          Topic.import new_topics, recursive: true
+        end
+
+        it "updates associated objects" do
+          new_author_name = 'Richard Bachman'
+          topic = new_topics.first
+          topic.books.each do |book|
+            book.author_name = new_author_name
+          end
+
+          assert_nothing_raised do
+            Topic.import new_topics,
+              recursive: true,
+              on_duplicate_key_update: [:id],
+              recursive_on_duplicate_key_update: {
+                books: { conflict_target: [:id], columns: [:author_name] }
+              }
+          end
+          Topic.find(topic.id).books.each do |book|
+            assert_equal new_author_name, book.author_name
+          end
+        end
+
+        it "updates nested associated objects" do
+          new_chapter_title = 'The Final Chapter'
+          book = new_topics.first.books.first
+          book.author_name = 'Richard Bachman'
+
+          example_chapter = book.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: {
+                books: { 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
 
     # If returning option is provided, it is only applied to top level models so that SQL with invalid

data/test/test_helper.rb

@@ -33,7 +33,9 @@ require 'chronic'
 begin
   require 'composite_primary_keys'
 rescue LoadError
-  ENV["SKIP_COMPOSITE_PK"] = "true"
+  if ENV['AR_VERSION'].to_f <= 7.1
+    ENV['SKIP_COMPOSITE_PK'] = 'true'
+  end
 end
 
 # Support MySQL 5.7

data/test/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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 1.5.0
+  version: 1.8.0
 platform: ruby
 authors:
 - Zach Dennis
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-08-21 00:00:00.000000000 Z
+date: 2024-08-23 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -51,6 +51,7 @@ files:
 - ".rubocop_todo.yml"
 - Brewfile
 - CHANGELOG.md
+- Dockerfile
 - Gemfile
 - LICENSE
 - README.markdown
@@ -68,6 +69,7 @@ files:
 - benchmarks/models/test_memory.rb
 - 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
@@ -75,6 +77,8 @@ files:
 - gemfiles/6.0.gemfile
 - gemfiles/6.1.gemfile
 - gemfiles/7.0.gemfile
+- gemfiles/7.1.gemfile
+- gemfiles/7.2.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -84,12 +88,14 @@ files:
 - lib/activerecord-import/active_record/adapters/postgresql_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/trilogy_adapter.rb
 - lib/activerecord-import/adapters/abstract_adapter.rb
 - lib/activerecord-import/adapters/em_mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql2_adapter.rb
 - lib/activerecord-import/adapters/mysql_adapter.rb
 - lib/activerecord-import/adapters/postgresql_adapter.rb
 - lib/activerecord-import/adapters/sqlite3_adapter.rb
+- lib/activerecord-import/adapters/trilogy_adapter.rb
 - lib/activerecord-import/base.rb
 - lib/activerecord-import/import.rb
 - lib/activerecord-import/mysql2.rb
@@ -111,6 +117,7 @@ files:
 - 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
@@ -121,11 +128,14 @@ files:
 - 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
@@ -169,13 +179,15 @@ files:
 - 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
 homepage: https://github.com/zdennis/activerecord-import
 licenses:
 - MIT
-metadata: {}
-post_install_message: 
+metadata:
+  changelog_uri: https://github.com/zdennis/activerecord-import/blob/master/CHANGELOG.md
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -190,8 +202,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3.1
-signing_key: 
+rubygems_version: 3.5.11
+signing_key:
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files:
@@ -208,6 +220,7 @@ test_files:
 - 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
@@ -218,11 +231,14 @@ test_files:
 - 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
@@ -266,5 +282,6 @@ test_files:
 - 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