activerecord-import 1.5.1 → 1.6.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f8b122b955b4a926db451a6a3ef72405ade6d69b54876bccb9ea51680486b328
-  data.tar.gz: 3af5c65f25ffb54d338d012aab4f3608513071287c8a759f3ba678850a81f6e0
+  metadata.gz: 32b6a19035fc43e21eeb0c6750e622a2605daf865b05aa9d551a697768456595
+  data.tar.gz: 7ba72ad6b48a05f52299bf6a49a487c880c82beacda25c6d6d6510a2d87bdf47
 SHA512:
-  metadata.gz: 638f6a8062713b07b1c2ebe866fa647c254d42e594c0fa056b5a710bcd9a2560b2217db73a89f5804c9fc1a71d5de05fc98625771e6225e9e148f58048618079
-  data.tar.gz: 806d66d95034276b0daec9c6c207b8a6187ec0950a44b312267aeef4d491b1c9f5e036641df35950296180f124315fc220e9af5d5b4d4057278176dcf667b1c3
+  metadata.gz: ac0cb801e0c0883ec3f09432cb500c919fda756c22b6a4fb29bf3e0ecb3ce0aa0a8700e1112ff9340c9f5f7cdb756618eeba5dcae1ce06602216d21c82506ae4
+  data.tar.gz: 572f5ea800559cb5fa928d1c82f4e1ef03edac7d1bed5e4bb2849423fdd8fc01bf235f829ef2ab1d230de8832e0d078615e60fc8feb8a48a92f74bb94e7b23a9

data/.github/workflows/test.yaml

@@ -16,6 +16,20 @@ 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:
@@ -44,7 +58,7 @@ jobs:
           - ruby: '3.0'
             env:
               AR_VERSION: 6.1
-          - ruby: jruby
+          - ruby: jruby-9.4.5.0
             env:
               AR_VERSION: '7.0'
           - ruby: 2.7
@@ -81,6 +95,7 @@ jobs:
         with:
           ruby-version: ${{ matrix.ruby }}
           bundler-cache: true
+          rubygems: latest
       - name: Set up databases
         run: |
           sudo /etc/init.d/mysql start
@@ -110,6 +125,9 @@ jobs:
         run: |
           bundle exec rake test:spatialite
           bundle exec rake test:sqlite3
+      - name: Run trilogy tests
+        if: ${{ matrix.env.AR_VERSION >= '7.0' && matrix.ruby != 'jruby' }}
+        run: bundle exec rake test:trilogy
   lint:
     runs-on: ubuntu-latest
     env:

data/CHANGELOG.md

@@ -1,3 +1,13 @@
+## 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

data/Gemfile

@@ -26,6 +26,10 @@ 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
@@ -37,7 +41,11 @@ platforms :jruby do
 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

@@ -364,6 +364,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

data/Rakefile

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

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

@@ -557,7 +557,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)

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "1.5.1"
+    VERSION = "1.6.0"
   end
 end

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

@@ -52,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/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/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.1
+  version: 1.6.0
 platform: ruby
 authors:
 - Zach Dennis
-autorequire:
+autorequire: 
 bindir: bin
 cert_chain: []
-date: 2023-11-18 00:00:00.000000000 Z
+date: 2024-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -87,12 +87,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
@@ -114,6 +116,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
@@ -172,13 +175,14 @@ 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:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -193,8 +197,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.25
-signing_key:
+rubygems_version: 3.0.3.1
+signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord
 test_files:
@@ -211,6 +215,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
@@ -269,5 +274,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