activerecord-import 1.4.0 → 1.5.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 71623b61f085adce5254fc92ae524f595594cb5a960bb4bf0cb46d961ca9d203
-  data.tar.gz: ce2200678685afd85dc0a887d967bae7e2e4220942ab2f8fc34bb949b8f5a31b
+  metadata.gz: 866dd09466fbda981329e13916e89986cb47d65259f0889b8a3b53aeca1aee32
+  data.tar.gz: 258a0d2fc34bbb928500e2f8a83df4f5bdc8901c25e2e123a569c56d587d3f53
 SHA512:
-  metadata.gz: 71bdd79b977164223d77c77ec796ac3914124318bb377c8aa044bc8085d0f7ba9536e35b99b6a670b0a4c825e4dfe49aef5a10626b92109b2ce7dd8cd529dbb1
-  data.tar.gz: 89db7ca7f321a473391d2083a2dc6cb4fe8614069441c2a16601a0a3e4ab848e889eafba67b53fc2042d60b7095aab50926f4795d07930c0c90820527f07c28c
+  metadata.gz: 989562e1fb64d669a96211c6b80df5b89d8a43aa38575ec6706d0633b405983a63849bd5fb78d4031ed7e4b2c239192f62d4b3d9e720f4c474cd3801600d11ef
+  data.tar.gz: 22e6ccbb750bb7851930d98c2b90f496c759d35503c8c1e58b841f4a928a283c486caec3f22cb57e6948b6960e6fff2a598499f0670f59b281e321dded20c183

data/.github/workflows/test.yaml

@@ -20,13 +20,19 @@ jobs:
       fail-fast: false
       matrix:
         ruby:
-          - 3.1
+          - 3.2
         env:
           - AR_VERSION: '7.0'
             RUBYOPT: --enable-frozen-string-literal
           - AR_VERSION: 6.1
             RUBYOPT: --enable-frozen-string-literal
         include:
+          - ruby: 3.1
+            env:
+              AR_VERSION: '7.0'
+          - ruby: 3.1
+            env:
+              AR_VERSION: 6.1
           - ruby: '3.0'
             env:
               AR_VERSION: '7.0'

data/.rubocop.yml

@@ -1,11 +1,11 @@
 inherit_from: .rubocop_todo.yml
 
-Lint/EndAlignment:
-  AlignWith: variable
-
 Metrics/AbcSize:
   Enabled: false
 
+Metrics/BlockLength:
+  Enabled: false
+
 Metrics/ClassLength:
   Enabled: false
 
@@ -24,8 +24,8 @@ Metrics/ModuleLength:
 Metrics/PerceivedComplexity:
   Enabled: false
 
-Style/AlignParameters:
-  EnforcedStyle: with_fixed_indentation
+Style/CommentedKeyword:
+  Enabled: false
 
 Style/ClassAndModuleChildren:
   Enabled: false
@@ -33,10 +33,25 @@ Style/ClassAndModuleChildren:
 Style/Documentation:
   Enabled: false
 
-Style/ElseAlignment:
+Style/EvalWithLocation:
+  Enabled: false
+
+Style/ExpandPathArguments:
+  Enabled: false
+
+Style/GuardClause:
+  Enabled: false
+
+Style/IfUnlessModifier:
+  Enabled: false
+
+Style/NumericPredicate:
+  Enabled: false
+
+Style/PercentLiteralDelimiters:
   Enabled: false
 
-Style/SpaceInsideParens:
+Style/RedundantBegin:
   Enabled: false
 
 Style/SpecialGlobalVars:
@@ -45,5 +60,56 @@ Style/SpecialGlobalVars:
 Style/StringLiterals:
   Enabled: false
 
-Style/TrailingCommaInLiteral:
+Style/SymbolArray:
+  Enabled: false
+
+Style/TrailingCommaInArrayLiteral:
+  Enabled: false
+
+Layout/ArgumentAlignment:
+  Enabled: false
+
+Layout/ParameterAlignment:
+  EnforcedStyle: with_fixed_indentation
+
+Layout/EndAlignment:
+  EnforcedStyleAlignWith: variable
+
+Layout/ElseAlignment:
+  Enabled: false
+
+Layout/EmptyLineAfterGuardClause:
+  Enabled: false
+
+Layout/HeredocIndentation:
+  Enabled: false
+
+Layout/SpaceInsideParens:
+  Enabled: false
+
+Layout/SpaceInsidePercentLiteralDelimiters:
+  Enabled: false
+
+Lint/ErbNewArguments:
+  Enabled: false
+
+Lint/MissingCopEnableDirective:
+  Enabled: false
+
+Lint/PercentStringArray:
+  Enabled: false
+
+Naming/HeredocDelimiterNaming:
+  Enabled: false
+
+Naming/MethodParameterName:
+  Enabled: false
+
+Security/YAMLLoad:
+  Enabled: false
+
+Gemspec/RequiredRubyVersion:
+  Enabled: false
+
+Bundler/OrderedGems:
   Enabled: false

data/.rubocop_todo.yml

@@ -1,36 +1,26 @@
 # This configuration was generated by
 # `rubocop --auto-gen-config`
-# on 2016-03-17 18:14:55 -0700 using RuboCop version 0.38.0.
+# on 2023-02-15 00:58:14 UTC using RuboCop version 1.45.1.
 # The point is for the user to remove these configuration records
 # one by one as the offenses are removed from the code base.
 # Note that changes in the inspected code, or installation of new
 # versions of RuboCop, may require this file to be generated again.
 
-# Offense count: 2
-Lint/HandleExceptions:
-  Exclude:
-    - 'lib/activerecord-import/base.rb'
-    - 'test/import_test.rb'
-
 # Offense count: 2
 Lint/RescueException:
   Exclude:
     - 'benchmarks/lib/cli_parser.rb'
     - 'test/import_test.rb'
 
-# Offense count: 4
-# Cop supports --auto-correct.
-# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods.
+# Offense count: 3
+# This cop supports safe autocorrection (--autocorrect).
+# Configuration parameters: AllowUnusedKeywordArguments, IgnoreEmptyMethods, IgnoreNotImplementedMethods.
 Lint/UnusedMethodArgument:
   Exclude:
     - 'lib/activerecord-import/adapters/postgresql_adapter.rb'
     - 'lib/activerecord-import/import.rb'
 
 # Offense count: 2
-# Cop supports --auto-correct.
-# Configuration parameters: Keywords.
-# Keywords: TODO, FIXME, OPTIMIZE, HACK, REVIEW
-Style/CommentAnnotation:
+Style/CombinableLoops:
   Exclude:
-    - 'benchmarks/lib/cli_parser.rb'
-    - 'lib/activerecord-import/import.rb'
+    - 'test/support/shared_examples/recursive_import.rb'

data/Brewfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 brew "mysql"
 brew "postgresql"
-brew "sqlite"
+brew "sqlite"

data/CHANGELOG.md

@@ -1,3 +1,21 @@
+## Changes in 1.5.0
+
+### New Features
+
+* Add Rails 7.1 support. Thanks to @gucki via \##807.
+* Add support for alias attributes. Thanks to @leonidkroka via \##799.
+
+### Fixes
+
+* Support for multi-byte column names when splitting queries. Thanks to @TakuyaKurimoto via \##801.
+* Fix issue with track_validation_failures when import models. Thanks to @OtaYohihiro via \##798.
+
+## Changes in 1.4.1
+
+### Fixes
+
+* Fix importing models that have required belongs_to associations and use composite primary keys. Thanks to @thoughtbot-summer via \##783.
+
 ## Changes in 1.4.0
 
 ### New Features

data/Gemfile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 source 'https://rubygems.org'
 
 gemspec
@@ -13,7 +15,7 @@ pg_version = '0.9'
 pg_version = '1.1' if version >= 6.1
 
 group :development, :test do
-  gem 'rubocop', '~> 0.40.0'
+  gem 'rubocop'
   gem 'rake'
 end
 
@@ -38,7 +40,7 @@ end
 gem "factory_bot"
 gem "timecop"
 gem "chronic"
-gem "mocha", "~> 1.3.0"
+gem "mocha", "~> 2.1.0"
 
 # Debugging
 platforms :jruby do
@@ -47,7 +49,7 @@ end
 
 platforms :ruby do
   gem "pry-byebug"
-  gem "pry", "~> 0.12.0"
+  gem "pry", "~> 0.14.0"
 end
 
 if version >= 4.0

data/README.markdown

@@ -245,8 +245,8 @@ Book.import columns, books, batch_size: 2, batch_progress: my_proc
 
 #### Recursive
 
-NOTE: This only works with PostgreSQL and ActiveRecord objects. This won't work with
-hashes or arrays as recursive inputs.
+> **Note**
+> This only works with PostgreSQL and ActiveRecord objects. This won't work with hashes or arrays as recursive inputs.
 
 Assume that Books <code>has_many</code> Reviews.
 
@@ -268,9 +268,9 @@ Key                       | Options               | Default            | Descrip
 :validate_uniqueness      | `true`/`false`        | `false`            | Whether or not to run uniqueness validations, has potential pitfalls, use with caution (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](https://github.com/zdennis/activerecord-import/#duplicate-key-ignore) for more details.
+:on_duplicate_key_ignore  | `true`/`false`        | `false`            | Allows skipping records with duplicate keys. See [here](#duplicate-key-ignore) for more details.
 :ignore                   | `true`/`false`        | `false`            | Alias for :on_duplicate_key_ignore.
-:on_duplicate_key_update  | :all, `Array`, `Hash` | N/A                | Allows upsert logic to be used. See [here](https://github.com/zdennis/activerecord-import/#duplicate-key-update) for more details.
+:on_duplicate_key_update  | :all, `Array`, `Hash` | N/A                | Allows upsert logic to be used. See [here](#duplicate-key-update) for more details.
 :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).
@@ -434,7 +434,8 @@ Should you wish to specify those columns, you may use the option `timestamps: fa
 However, it is also possible to set just `:created_at` in specific records. In this case despite using `timestamps: true`,  `:created_at` will be updated only in records where that field is `nil`. Same rule applies for record associations when enabling the option `recursive: true`.
 
 If you are using custom time zones, these will be respected when performing imports as well as long as `ActiveRecord::Base.default_timezone` is set, which for practically all Rails apps it is.
-NOTE: If you are using ActiveRecord 7.0 or later, please use `ActiveRecord.default_timezone` instead.
+> **Note**
+> If you are using ActiveRecord 7.0 or later, please use `ActiveRecord.default_timezone` instead.
 
 ### Callbacks
 
@@ -506,7 +507,8 @@ This allows an external gem to dynamically add an adapter without the need to ad
 
 ### Requiring
 
-Note: These instructions will only work if you are using version 0.2.0 or higher.
+> **Note**
+> These instructions will only work if you are using version 0.2.0 or higher.
 
 #### Autoloading via Bundler
 

data/Rakefile

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "bundler"
 Bundler.setup
 

data/activerecord-import.gemspec

@@ -1,4 +1,5 @@
-# -*- encoding: utf-8 -*-
+# frozen_string_literal: true
+
 require File.expand_path('../lib/activerecord-import/version', __FILE__)
 
 Gem::Specification.new do |gem|

data/benchmarks/benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'pathname'
 require "fileutils"
 require "active_record"
@@ -39,7 +41,7 @@ require File.join(benchmark_dir, "../test/schema/generic_schema")
 adapter_schema = File.join(benchmark_dir, "schema/#{options.adapter}_schema.rb")
 require adapter_schema if File.exist?(adapter_schema)
 
-Dir[File.dirname(__FILE__) + "/models/*.rb"].each { |file| require file }
+Dir["#{File.dirname(__FILE__)}/models/*.rb"].sort.each { |file| require file }
 
 require File.join( benchmark_dir, 'lib', "#{options.adapter}_benchmark" )
 
@@ -51,8 +53,8 @@ else
 end
 
 letter = options.adapter[0].chr
-clazz_str = letter.upcase + options.adapter[1..-1].downcase
-clazz = Object.const_get( clazz_str + "Benchmark" )
+clazz_str = letter.upcase + options.adapter[1..].downcase
+clazz = Object.const_get( "#{clazz_str}Benchmark" )
 
 benchmarks = []
 options.number_of_objects.each do |num|

data/benchmarks/lib/base.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class BenchmarkBase
   attr_reader :results
 
@@ -25,11 +27,11 @@ class BenchmarkBase
   # An OpenStruct object with the following attributes:
   #   * description - the description of the benchmark ran
   #   * tms - a Benchmark::Tms containing the results of the benchmark
-  def bm( description )
+  def bm( description, &block )
     tms = nil
     puts "Benchmarking #{description}"
 
-    Benchmark.bm { |x| tms = x.report { yield } }
+    Benchmark.bm { |x| tms = x.report(&block) }
     delete_all
     failed = false
 

data/benchmarks/lib/cli_parser.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'optparse'
 require 'ostruct'
 
@@ -8,7 +10,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.".freeze
+  BANNER = "Usage: ruby #{$0} [options]\nSee ruby #{$0} -h for more options."
 
   def self.print_banner
     puts BANNER
@@ -27,7 +29,7 @@ module BenchmarkOptionParser
     print_valid_table_types( options, prefix: "    " )
   end
 
-  # TODO IMPLEMENT THIS
+  # TODO: IMPLEMENT THIS
   def self.print_valid_table_types( options, hsh = { prefix: '' } )
     if !options.table_types.keys.empty?
       options.table_types.keys.sort.each { |type| puts hsh[:prefix].to_s + type.to_s }

data/benchmarks/lib/float.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 # Taken from http://www.programmingishard.com/posts/show/128
 # Posted by rbates
 class Float

data/benchmarks/lib/mysql2_benchmark.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class Mysql2Benchmark < BenchmarkBase
   def benchmark_all( array_of_cols_and_vals )
     methods = self.methods.find_all { |m| m =~ /benchmark_/ }

data/benchmarks/lib/output_to_csv.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require 'csv'
 
 module OutputToCSV

data/benchmarks/lib/output_to_html.rb

@@ -1,7 +1,9 @@
+# frozen_string_literal: true
+
 require 'erb'
 
 module OutputToHTML
-  TEMPLATE_HEADER = <<"EOT".freeze
+  TEMPLATE_HEADER = <<"EOT"
   <div>
     All times are rounded to the nearest thousandth for display purposes. Speedups next to each time are computed
     before any rounding occurs. Also, all speedup calculations are computed by comparing a given time against
@@ -9,7 +11,7 @@ module OutputToHTML
    </div>
 EOT
 
-  TEMPLATE = <<"EOT".freeze
+  TEMPLATE = <<"EOT"
  <style>
  td#benchmarkTitle {
    border: 1px solid black;

data/benchmarks/models/test_innodb.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestInnoDb < ActiveRecord::Base
   self.table_name = 'test_innodb'
 end

data/benchmarks/models/test_memory.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestMemory < ActiveRecord::Base
   self.table_name = 'test_memory'
 end

data/benchmarks/models/test_myisam.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 class TestMyISAM < ActiveRecord::Base
   self.table_name = 'test_myisam'
 end

data/benchmarks/schema/mysql2_schema.rb

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 ActiveRecord::Schema.define do
   create_table :test_myisam, options: 'ENGINE=MyISAM', force: true do |t|
     t.column :my_name, :string, null: false

data/gemfiles/4.2.gemfile

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

data/gemfiles/5.0.gemfile

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

data/gemfiles/5.1.gemfile

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

data/gemfiles/5.2.gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 gem 'activerecord', '~> 5.2.0'
 gem 'composite_primary_keys', '~> 11.0'

data/gemfiles/6.0.gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 gem 'activerecord', '~> 6.0.0'
 gem 'composite_primary_keys', '~> 12.0'

data/gemfiles/6.1.gemfile

@@ -1,2 +1,4 @@
+# frozen_string_literal: true
+
 gem 'activerecord', '~> 6.1.0'
 gem 'composite_primary_keys', '~> 13.0'

data/gemfiles/7.0.gemfile

@@ -1 +1,4 @@
+# frozen_string_literal: true
+
 gem 'activerecord', '~> 7.0.0'
+gem 'composite_primary_keys', '~> 14.0'

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "activerecord-import/adapters/abstract_adapter"
 
 module ActiveRecord # :nodoc:

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/mysql2_adapter"
 require "activerecord-import/adapters/mysql2_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/postgresql_adapter"
 require "activerecord-import/adapters/postgresql_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/sqlite3_adapter"
 require "activerecord-import/adapters/sqlite3_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/mysql2_adapter"
 require "activerecord-import/adapters/mysql2_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/postgresql_adapter"
 require "activerecord-import/adapters/postgresql_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "seamless_database_pool"
 require "active_record/connection_adapters/seamless_database_pool_adapter"
 require "activerecord-import/adapters/mysql_adapter"

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "active_record/connection_adapters/sqlite3_adapter"
 require "activerecord-import/adapters/sqlite3_adapter"
 

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 module ActiveRecord::Import::AbstractAdapter
   module InstanceMethods
     def next_value_for_sequence(sequence_name)
@@ -7,10 +9,11 @@ module ActiveRecord::Import::AbstractAdapter
     def insert_many( sql, values, _options = {}, *args ) # :nodoc:
       number_of_inserts = 1
 
-      base_sql, post_sql = if sql.is_a?( String )
-        [sql, '']
-      elsif sql.is_a?( Array )
-        [sql.shift, sql.join( ' ' )]
+      base_sql, post_sql = case sql
+                           when String
+                             [sql, '']
+                           when Array
+                             [sql.shift, sql.join( ' ' )]
       end
 
       sql2insert = base_sql + values.join( ',' ) + post_sql
@@ -45,7 +48,7 @@ module ActiveRecord::Import::AbstractAdapter
       post_sql_statements = []
 
       if supports_on_duplicate_key_update? && options[:on_duplicate_key_update]
-        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:primary_key], options[:locking_column] )
+        post_sql_statements << sql_for_on_duplicate_key_update( table_name, options[:on_duplicate_key_update], options[:model], options[:primary_key], options[:locking_column] )
       elsif logger && options[:on_duplicate_key_update]
         logger.warn "Ignoring on_duplicate_key_update because it is not supported by the database."
       end

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "activerecord-import/adapters/mysql_adapter"
 
 module ActiveRecord::Import::EMMysql2Adapter

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

@@ -1,3 +1,5 @@
+# frozen_string_literal: true
+
 require "activerecord-import/adapters/mysql_adapter"
 
 module ActiveRecord::Import::Mysql2Adapter