activerecord-import 2.1.0 → 2.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ed6151dcefbe456505980e5f6a89898da893ee6e25ae4aeddc28aa0b1efe0765
-  data.tar.gz: 381eb0b7b0910fc6900a73448728644e2e1d996e7744f9c8ff98d65ffefbaaf0
+  metadata.gz: f7cd19fa557186daf34db96db71f26a7db70b15e66a0a42eaab33be304945ab0
+  data.tar.gz: ff8afe763d437210ea1c78e21bacd0b4ae84f113fbadbda087077bf402f08e64
 SHA512:
-  metadata.gz: '08492e9de01d21c6c8b5a12c8cd35c01b92040d148a7abc72a098405b10d0f1ae971ed2eb4185b8a2415a9bdb578452746f90aff5f57f50b4568082227a9dad4'
-  data.tar.gz: 297a437db1f4098f716bc55c47b22346634677d3abf3706634ed7c2aecd74d959d356720d353f369e588bcba4b9f0c09db5ce444908b0e75c75353ebc74fa059
+  metadata.gz: 402d2087c8c35a2adfa3787ee4e183883df74cc1f4ad2276de1227ba9778b630bfbee546faa3b53b7dcbe1142232bd7d03de046ccab5c6caa5c475a3bc4f15c1
+  data.tar.gz: ef5ce7d4dba744b3c58a0affbe326b50d764c7e4c4726b468ad4d18eacee13fbaa8d7b5d78459bc048e8eeb0628cf34b52a59f759f0a1f4d9d491b7439d5845a

data/.github/workflows/test.yaml

@@ -126,6 +126,7 @@ jobs:
           bundle exec rake test:mysql2_makara
           bundle exec rake test:mysql2spatial
           bundle exec rake test:mysql2_proxy
+          bundle exec rake test:janus_mysql2
       - name: Run tests with postgresql
         run: |
           bundle exec rake test:postgis
@@ -142,7 +143,10 @@ jobs:
           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
+        run: |
+          bundle exec rake test:trilogy
+          bundle exec rake test:janus_trilogy
+
   lint:
     runs-on: ubuntu-latest
     env:

data/.rubocop.yml

@@ -15,9 +15,6 @@ Metrics/ClassLength:
 Metrics/CyclomaticComplexity:
   Enabled: false
 
-Metrics/LineLength:
-  Enabled: false
-
 Metrics/MethodLength:
   Enabled: false
 
@@ -93,6 +90,9 @@ Layout/SpaceInsideParens:
 Layout/SpaceInsidePercentLiteralDelimiters:
   Enabled: false
 
+Layout/LineLength:
+  Enabled: false
+
 Lint/ErbNewArguments:
   Enabled: false
 

data/CHANGELOG.md

@@ -1,3 +1,9 @@
+## Changes in 2.2.0
+
+### New Features
+
+* Add Support for Janus ActiveRecord adapters. Thanks to @permidon via #\873.
+
 ## Changes in 2.1.0
 
 ### New Features

data/Rakefile

@@ -20,6 +20,7 @@ ADAPTERS = %w(
   mysql2_makara
   mysql2spatial
   mysql2_proxy
+  janus_mysql2
   jdbcmysql
   jdbcsqlite3
   jdbcpostgresql
@@ -32,6 +33,7 @@ ADAPTERS = %w(
   spatialite
   seamless_database_pool
   trilogy
+  janus_trilogy
 ).freeze
 ADAPTERS.each do |adapter|
   namespace :test do

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

@@ -58,7 +58,7 @@ module ActiveRecord::Import::SQLite3Adapter
     sql = []
 
     # Options :recursive and :on_duplicate_key_ignore are mutually exclusive
-    if supports_on_duplicate_key_update? && ((options[:ignore] || options[:on_duplicate_key_ignore]) && !options[:on_duplicate_key_update])
+    if supports_on_duplicate_key_update? && (options[:ignore] || options[:on_duplicate_key_ignore]) && !options[:on_duplicate_key_update]
       sql << sql_for_on_duplicate_key_ignore( options[:on_duplicate_key_ignore] )
     end
 

data/lib/activerecord-import/base.rb

@@ -12,12 +12,14 @@ module ActiveRecord::Import
     when 'mysql2_makara' then 'mysql2'
     when 'mysql2spatial' then 'mysql2'
     when 'mysql2_proxy' then 'mysql2'
+    when 'janus_mysql2' then 'mysql2'
     when 'spatialite' then 'sqlite3'
     when 'postgresql_makara' then 'postgresql'
     when 'postgresql_proxy' then 'postgresql'
     when 'makara_postgis' then 'postgresql'
     when 'postgis' then 'postgresql'
     when 'cockroachdb' then 'postgresql'
+    when 'janus_trilogy' then 'trilogy'
     else adapter
     end
   end

data/lib/activerecord-import/import.rb

@@ -559,7 +559,7 @@ class ActiveRecord::Base
       options[:primary_key] = primary_key
       options[:locking_column] = locking_column if locking_enabled?
 
-      is_validating = options[:validate_with_context].present? ? true : options[:validate]
+      is_validating = options[:validate_with_context].present? || options[:validate]
       validator = ActiveRecord::Import::Validator.new(self, options)
 
       # assume array of model objects
@@ -1132,8 +1132,6 @@ When importing an array of hashes with provided columns_names, each hash must co
 
 Required keys: #{required_keys}
 Missing keys: #{missing_keys}
-
-Hash: #{hash}
         EOS
       else
         <<-EOS
@@ -1146,8 +1144,6 @@ for the missing keys or group these records into batches by key set before impor
 Required keys: #{required_keys}
 Extra keys: #{extra_keys}
 Missing keys: #{missing_keys}
-
-Hash: #{hash}
         EOS
       end
     end

data/lib/activerecord-import/version.rb

@@ -2,6 +2,6 @@
 
 module ActiveRecord
   module Import
-    VERSION = "2.1.0"
+    VERSION = "2.2.0"
   end
 end

data/test/adapters/janus_mysql2.rb

@@ -0,0 +1,3 @@
+# frozen_string_literal: true
+
+ENV["ARE_DB"] = "mysql2"

data/test/adapters/janus_trilogy.rb

@@ -0,0 +1,11 @@
+# frozen_string_literal: true
+
+require 'logger'
+
+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

@@ -19,6 +19,9 @@ mysql2_makara:
 mysql2_proxy:
   <<: *mysql2
 
+janus_mysql2:
+  <<: *mysql2
+
 postgresql: &postgresql
   <<: *common
   username: postgres
@@ -63,3 +66,8 @@ trilogy:
   <<: *common
   adapter: trilogy
   host: mysql
+
+janus_trilogy:
+  <<: *common
+  adapter: trilogy
+  host: mysql

data/test/github/database.yml

@@ -33,6 +33,9 @@ mysql2_makara:
 mysql2_proxy:
   <<: *mysql2
 
+janus_mysql2:
+  <<: *mysql2
+
 oracle:
   <<: *common
   adapter: oracle
@@ -76,3 +79,7 @@ spatialite:
 trilogy:
   <<: *common
   adapter: trilogy
+
+janus_trilogy:
+  <<: *common
+  adapter: trilogy

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 2.1.0
+  version: 2.2.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2025-02-03 00:00:00.000000000 Z
+date: 2025-05-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -99,6 +99,8 @@ files:
 - 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
@@ -118,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
@@ -206,6 +210,8 @@ 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
@@ -225,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