activerecord-import 0.28.1 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: dbd7badbb2e98c6725ddaf5edbb713c4f79bfc01
-  data.tar.gz: 0912df3959070820db94063d0172a43f4b027a9f
+SHA256:
+  metadata.gz: b9bf4dc4ecf93b15a493cc34134158d7df3d6391b2e6c7fafbe79b630df48ea3
+  data.tar.gz: ab5f7f4707598308dc9a2e7d4be5816f1d5674f63cea58e48b29f6ed87fa059a
 SHA512:
-  metadata.gz: 22fb70781c58df1795c41e5b8e954b8a89e6c85be0dbf33f2c2fb9265847778f99f414cbd7fe9ea945d6aa43f89d7557ea41541f938fa357a7bbcb2c0e6114df
-  data.tar.gz: b480446464f626518ac128b2e79d4e4dbb2b50e8e52d6781812a0ee1594e5328430214ad03be9590c09dcfd07661ae54130b53ccde1b9b7d2131d2f40c80a633
+  metadata.gz: 05c4ad6281d6f0f574ee30cffed790763fb393fdf906ecc20bb8b4504f640ef9734ea1a43284f9821e543f8900aa3023bf66bcf455afcb2419e15828da618a05
+  data.tar.gz: cdc67be0552c3b32a980598a784964df98549a27d428b89ef3ed7385acb4c75681946e010e714770ac81ff076088c0293e26bc04bbc2e15aecd42bf86c3aecc8

data/.travis.yml

@@ -1,30 +1,29 @@
 language: ruby
 cache: bundler
 rvm:
-  - 2.3.7
+  - 2.5.5
 
 env:
   global:
     # https://github.com/discourse/discourse/blob/master/.travis.yml
     - RUBY_GC_MALLOC_LIMIT=50000000
   matrix:
-    - AR_VERSION=3.2
-    - AR_VERSION=4.0
-    - AR_VERSION=4.1
-    - AR_VERSION=4.2
-    - AR_VERSION=5.0
     - AR_VERSION=5.1
     - AR_VERSION=5.2
+    - AR_VERSION=6.0
 
 matrix:
   include:
-    - rvm: jruby-9.1.14.0
+    - rvm: 2.3.8
+      env: AR_VERSION=3.2
+    - rvm: 2.3.8
+      env: AR_VERSION=4.0
+    - rvm: 2.3.8
+      env: AR_VERSION=4.1
+    - rvm: 2.3.8
       env: AR_VERSION=4.2
-
-      script:
-        - bundle exec rake test:jdbcsqlite3
-        - bundle exec rake test:jdbcmysql
-        - bundle exec rake test:jdbcpostgresql
+    - rvm: 2.3.8
+      env: AR_VERSION=5.0
 
   fast_finish: true
 
@@ -38,7 +37,7 @@ addons:
       - sqlite3
       - mysql-server
       - mysql-client
-      - postgresql-9.5-postgis-2.3
+      - postgresql-9.5-postgis-2.4
 
 before_install:
   - gem update --system
@@ -66,6 +65,10 @@ script:
   - bundle exec rake test:sqlite3
   - bundle exec rubocop
 
-dist: trusty
+dist: xenial
+
+services:
+  - mysql
+  - postgresql
 
 sudo: required

data/CHANGELOG.md

@@ -1,3 +1,69 @@
+## Changes in 1.0.3
+
+### New Features
+
+* Add support for ActiveRecord 6.1.0.alpha. Thanks to @imtayadeway via
+  \#642.
+
+### Fixes
+
+* Return an empty array for results instead of nil when importing empty
+  array. Thanks to @gyfis via \#636.
+
+## Changes in 1.0.2
+
+### New Features
+
+* Add support for CockroachDB adapter. Thanks to @willie via \#605.
+* Add support for ActiveRecord 6.0.0.rc1. Thanks to @madeindjs, @bill-filler,
+  @jkowens via \#619, \#623.
+
+### Fixes
+
+* Fixes NoMethodError when attempting to use nil logger. Thanks to @MattMecel,
+  @khiav22357.
+* Fix issue validating STI models. Thanks to @thejbsmith, @jkowens via
+  \#626.
+
+## Changes in 1.0.1
+
+### Fixes
+
+* Raise an error with a helpful message if array of values exceeds the number of
+  columns for a table. Thanks to @golddranks via \#589.
+* Properly check if model responds to import before creating alias.
+  Thanks to @jcw- via \#591.
+* No longer pass :returning option to child associations on recursive
+  import. Thanks to @dmitriy-kiriyenko via \#595.
+* Fix import issue for models with Postgresql json/jsonb fields. Thanks
+  to @stokarenko via \#594.
+* Fix issue importing models with timestamps that contain timezone
+  information. Thaks to @dekaikiwi, @jkowens via \#598.
+* Ignore :no_returning when using :recursive option. Thanks to @dgollahon, @jkowens
+  via \#599.
+
+## Changes in 1.0.0
+
+### New Features
+
+* Move ActiveRecord::Dirty changes to previous_changes after import.
+  Thanks to @stokarenko via \#584.
+
+### Breaking Changes
+
+* Previously :on_duplicate_key_update was enabled by default for MySQL.
+  The update timestamp columns (updated_at, updated_on) would be updated
+  on duplicate key. This was behavior is inconsistent with the other database
+  adapters and could also be considered surprising. Going forward it must
+  be explicitly enabled. See \#548.
+
+## Changes in 0.28.2
+
+### Fixes
+
+* Fix issue where validations where not working in certain scenarios.
+  Thanks to @CASIXx1 via \#579.
+
 ## Changes in 0.28.1
 
 ### Fixes

data/Gemfile

@@ -6,6 +6,8 @@ version = ENV['AR_VERSION'].to_f
 
 mysql2_version = '0.3.0'
 mysql2_version = '0.4.0' if version >= 4.2
+sqlite3_version = '1.3.0'
+sqlite3_version = '1.4.0' if version >= 6.0
 
 group :development, :test do
   gem 'rubocop', '~> 0.40.0'
@@ -16,7 +18,7 @@ end
 platforms :ruby do
   gem "mysql2",                 "~> #{mysql2_version}"
   gem "pg",                     "~> 0.9"
-  gem "sqlite3",                "~> 1.3.10"
+  gem "sqlite3",                "~> #{sqlite3_version}"
   gem "seamless_database_pool", "~> 1.0.20"
 end
 

data/README.markdown

@@ -1,6 +1,6 @@
-# activerecord-import [![Build Status](https://travis-ci.org/zdennis/activerecord-import.svg?branch=master)](https://travis-ci.org/zdennis/activerecord-import)
+# Activerecord-Import [![Build Status](https://travis-ci.org/zdennis/activerecord-import.svg?branch=master)](https://travis-ci.org/zdennis/activerecord-import)
 
-activerecord-import is a library for bulk inserting data using ActiveRecord.
+Activerecord-Import is a library for bulk inserting data using ActiveRecord.
 
 One of its major features is following activerecord associations and generating the minimal
 number of SQL insert statements required, avoiding the N+1 insert problem. An example probably
@@ -23,10 +23,10 @@ an 18 hour batch process to <2 hrs.
 
 The gem provides the following high-level features:
 
-* activerecord-import can work with raw columns and arrays of values (fastest)
-* activerecord-import works with model objects (faster)
-* activerecord-import can perform validations (fast)
-* activerecord-import can perform on duplicate key updates (requires MySQL or Postgres 9.5+)
+* Works with raw columns and arrays of values (fastest)
+* Works with model objects (faster)
+* Performs validations (fast)
+* Performs on duplicate key updates (requires MySQL, SQLite 3.24.0+, or Postgres 9.5+)
 
 ## Table of Contents
 
@@ -54,6 +54,7 @@ The gem provides the following high-level features:
 * [More Information](#more-information)
 * [Contributing](#contributing)
   * [Running Tests](#running-tests)
+  * [Issue Triage](#issue-triage)
 
 ### Examples
 
@@ -63,7 +64,7 @@ Without `activerecord-import`, you'd write something like this:
 
 ```ruby
 10.times do |i|
-  Book.create! :name => "book #{i}"
+  Book.create! name: "book #{i}"
 end
 ```
 
@@ -72,7 +73,7 @@ This would end up making 10 SQL calls. YUCK!  With `activerecord-import`, you ca
 ```ruby
 books = []
 10.times do |i|
-  books << Book.new(:name => "book #{i}")
+  books << Book.new(name: "book #{i}")
 end
 Book.import books    # or use import!
 ```
@@ -85,13 +86,13 @@ The `import` method can take an array of column names (string or symbols) and an
 
 ```ruby
 columns = [ :title, :author ]
-values = [ ['Book1', 'FooManChu'], ['Book2', 'Bob Jones'] ]
+values = [ ['Book1', 'George Orwell'], ['Book2', 'Bob Jones'] ]
 
 # Importing without model validations
-Book.import columns, values, :validate => false
+Book.import columns, values, validate: false
 
 # Import with model validations
-Book.import columns, values, :validate => true
+Book.import columns, values, validate: true
 
 # when not specified :validate defaults to true
 Book.import columns, values
@@ -102,7 +103,7 @@ Book.import columns, values
 The `import` method can take an array of hashes. The keys map to the column names in the database.
 
 ```ruby
-values = [{ title: 'Book1', author: 'FooManChu' }, { title: 'Book2', author: 'Bob Jones'}]
+values = [{ title: 'Book1', author: 'George Orwell' }, { title: 'Book2', author: 'Bob Jones'}]
 
 # Importing without model validations
 Book.import values, validate: false
@@ -113,13 +114,13 @@ Book.import values, validate: true
 # when not specified :validate defaults to true
 Book.import values
 ```
-h2. Import Using Hashes and Explicit Column Names
+#### Import Using Hashes and Explicit Column Names
 
 The `import` method can take an array of column names and an array of hash objects. The column names are used to determine what fields of data should be imported. The following example will only import books with the `title` field:
 
 ```ruby
 books = [
-  { title: "Book 1", author: "FooManChu" },
+  { title: "Book 1", author: "George Orwell" },
   { title: "Book 2", author: "Bob Jones" }
 ]
 columns = [ :title ]
@@ -171,15 +172,15 @@ The `import` method can take an array of models. The attributes will be pulled o
 
 ```ruby
 books = [
-  Book.new(:title => "Book 1", :author => "FooManChu"),
-  Book.new(:title => "Book 2", :author => "Bob Jones")
+  Book.new(title: "Book 1", author: "George Orwell"),
+  Book.new(title: "Book 2", author: "Bob Jones")
 ]
 
 # without validations
-Book.import books, :validate => false
+Book.import books, validate: false
 
 # with validations
-Book.import books, :validate => true
+Book.import books, validate: true
 
 # when not specified :validate defaults to true
 Book.import books
@@ -189,16 +190,16 @@ The `import` method can take an array of column names and an array of models. Th
 
 ```ruby
 books = [
-  Book.new(:title => "Book 1", :author => "FooManChu"),
-  Book.new(:title => "Book 2", :author => "Bob Jones")
+  Book.new(title: "Book 1", author: "George Orwell"),
+  Book.new(title: "Book 2", author: "Bob Jones")
 ]
 columns = [ :title ]
 
 # without validations
-Book.import columns, books, :validate => false
+Book.import columns, books, validate: false
 
 # with validations
-Book.import columns, books, :validate => true
+Book.import columns, books, validate: true
 
 # when not specified :validate defaults to true
 Book.import columns, books
@@ -217,15 +218,15 @@ The `import` method can take a `batch_size` option to control the number of rows
 
 ```ruby
 books = [
-  Book.new(:title => "Book 1", :author => "FooManChu"),
-  Book.new(:title => "Book 2", :author => "Bob Jones"),
-  Book.new(:title => "Book 1", :author => "John Doe"),
-  Book.new(:title => "Book 2", :author => "Richard Wright")
+  Book.new(title: "Book 1", author: "George Orwell"),
+  Book.new(title: "Book 2", author: "Bob Jones"),
+  Book.new(title: "Book 1", author: "John Doe"),
+  Book.new(title: "Book 2", author: "Richard Wright")
 ]
 columns = [ :title ]
 
 # 2 INSERT statements for 4 records
-Book.import columns, books, :batch_size => 2
+Book.import columns, books, batch_size: 2
 ```
 
 #### Recursive
@@ -237,8 +238,8 @@ Assume that Books has_many Reviews.
 ```ruby
 books = []
 10.times do |i|
-  book = Book.new(:name => "book #{i}")
-  book.reviews.build(:title => "Excellent")
+  book = Book.new(name: "book #{i}")
+  book.reviews.build(title: "Excellent")
   books << book
 end
 Book.import books, recursive: true
@@ -248,7 +249,7 @@ Book.import books, recursive: true
 
 Key                     | Options               | Default            | Description
 ----------------------- | --------------------- | ------------------ | -----------
-:validate               | `true`/`false`        | `true`             | Whether or not to run `ActiveRecord` validations (uniqueness skipped).
+: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`).
 :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.
 :ignore                 | `true`/`false`        | `false`            | Alias for :on_duplicate_key_ignore.
@@ -267,14 +268,14 @@ Key                     | Options               | Default            | Descripti
 For Postgres 9.5+ it adds `ON CONFLICT DO NOTHING`, for MySQL it uses `INSERT IGNORE`, and for SQLite it uses `INSERT OR IGNORE`. Cannot be enabled on a recursive import. For database adapters that normally support setting primary keys on imported objects, this option prevents that from occurring.
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 book.author = "Bob Barker"
 
 Book.import [book], on_duplicate_key_ignore: true
 
 book.reload.title  # => "Book1"     (stayed the same)
-book.reload.author # => "FooManChu" (stayed the same)
+book.reload.author # => "George Orwell" (stayed the same)
 ```
 
 The option `:on_duplicate_key_ignore` is bypassed when `:recursive` is enabled for [PostgreSQL imports](https://github.com/zdennis/activerecord-import/wiki#recursive-example-postgresql-only).
@@ -290,7 +291,7 @@ This will use MySQL's `ON DUPLICATE KEY UPDATE` or Postgres/SQLite `ON CONFLICT
 Basic Update
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 book.author = "Bob Barker"
 
@@ -304,13 +305,13 @@ Book.import [book], on_duplicate_key_update: {conflict_target: [:id], columns: [
 Book.import [book], on_duplicate_key_update: [:title]
 
 book.reload.title  # => "Updated Book Title" (changed)
-book.reload.author # => "FooManChu"          (stayed the same)
+book.reload.author # => "George Orwell"          (stayed the same)
 ```
 
 Using the value from another column
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.title = "Updated Book Title"
 
 # MySQL version
@@ -328,7 +329,7 @@ book.reload.author # => "Updated Book Title" (changed)
 Using Custom SQL
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu"
+book = Book.create! title: "Book1", author: "George Orwell"
 book.author = "Bob Barker"
 
 # MySQL version
@@ -349,7 +350,7 @@ book.reload.author # => "Bob Barker" (changed)
 PostgreSQL Using constraints
 
 ```ruby
-book = Book.create! title: "Book1", author: "FooManChu", edition: 3, published_at: nil
+book = Book.create! title: "Book1", author: "George Orwell", edition: 3, published_at: nil
 book.published_at = Time.now
 
 # in migration
@@ -363,7 +364,7 @@ Book.import [book], on_duplicate_key_update: {constraint_name: :for_upsert, colu
 
 
 book.reload.title  # => "Book1"          (stayed the same)
-book.reload.author # => "FooManChu"      (stayed the same)
+book.reload.author # => "George Orwell"      (stayed the same)
 book.reload.edition # => 3               (stayed the same)
 book.reload.published_at # => 2017-10-09 (changed)
 ```
@@ -383,7 +384,7 @@ articles = [
   Article.new(author_id: 3, content: '')
 ]
 
-demo = Article.import(articles), returning: :title # => #<struct ActiveRecord::Import::Result
+demo = Article.import(articles, returning: :title) # => #<struct ActiveRecord::Import::Result
 
 demo.failed_instances
 => [#<Article id: 3, author_id: 3, title: nil, content: "", created_at: nil, updated_at: nil>]
@@ -397,7 +398,7 @@ demo.ids
 
 demo.results
 => ["First Article", "Second Article"] # for Postgres
-=> [] for other DBs
+=> [] # for other DBs
 ```
 
 ### Counter Cache
@@ -552,7 +553,7 @@ When rubygems pushes the `lib` folder onto the load path a `require` will now fi
 
 ### Conflicts With Other Gems
 
-`activerecord-import` adds the `.import` method onto `ActiveRecord::Base`. There are other gems, such as `elasticsearch-rails`, that do the same thing. In conflicts such as this, there is an aliased method named `.bulk_import` that can be used interchangeably.
+Activerecord-Import adds the `.import` method onto `ActiveRecord::Base`. There are other gems, such as `elasticsearch-rails`, that do the same thing. In conflicts such as this, there is an aliased method named `.bulk_import` that can be used interchangeably.
 
 If you are using the `apartment` gem, there is a weird triple interaction between that gem, `activerecord-import`, and `activerecord` involving caching of the `sequence_name` of a model. This can be worked around by explcitly setting this value within the model. For example:
 
@@ -579,7 +580,7 @@ See https://github.com/zdennis/activerecord-import/issues/233 for further discus
 
 ### More Information
 
-For more information on activerecord-import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
+For more information on Activerecord-Import please see its wiki: https://github.com/zdennis/activerecord-import/wiki
 
 To document new information, please add to the README instead of the wiki. See https://github.com/zdennis/activerecord-import/issues/397 for discussion.
 
@@ -605,6 +606,10 @@ AR_VERSION=4.2 bundle exec rake test:postgresql test:sqlite3 test:mysql2
 
 Once you have pushed up your changes, you can find your CI results [here](https://travis-ci.org/zdennis/activerecord-import/).
 
+## 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).
+
 # License
 
 This is licensed under the ruby license.
@@ -612,17 +617,3 @@ This is licensed under the ruby license.
 # Author
 
 Zach Dennis (zach.dennis@gmail.com)
-
-# Contributors
-
-* Jordan Owens (@jkowens)
-* Erik Michaels-Ober (@sferik)
-* Blythe Dunham
-* Gabe da Silveira
-* Henry Work
-* James Herdman
-* Marcus Crafter
-* Thibaud Guillaume-Gentil
-* Mark Van Holstyn
-* Victor Costan
-* Dillon Welch

data/gemfiles/6.0.gemfile

@@ -0,0 +1 @@
+gem 'activerecord', '~> 6.0.0'

data/gemfiles/6.1.gemfile

@@ -0,0 +1 @@
+gem 'activerecord', '~> 6.1.0.alpha', github: "rails/rails"

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

@@ -46,7 +46,7 @@ module ActiveRecord::Import::AbstractAdapter
 
       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] )
-      elsif options[:on_duplicate_key_update]
+      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/mysql_adapter.rb

@@ -71,14 +71,11 @@ module ActiveRecord::Import::MysqlAdapter
 
   # Add a column to be updated on duplicate key update
   def add_column_for_on_duplicate_key_update( column, options = {} ) # :nodoc:
-    if options.include?(:on_duplicate_key_update)
-      columns = options[:on_duplicate_key_update]
+    if (columns = options[:on_duplicate_key_update])
       case columns
       when Array then columns << column.to_sym unless columns.include?(column.to_sym)
       when Hash then columns[column.to_sym] = column.to_sym
       end
-    elsif !options[:ignore] && !options[:on_duplicate_key_ignore]
-      options[:on_duplicate_key_update] = [column.to_sym]
     end
   end
 

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

@@ -19,7 +19,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
     sql2insert = base_sql + values.join( ',' ) + post_sql
 
     columns = returning_columns(options)
-    if columns.blank? || options[:no_returning]
+    if columns.blank? || (options[:no_returning] && !options[:recursive])
       insert( sql2insert, *args )
     else
       returned_values = if columns.size > 1
@@ -73,14 +73,14 @@ module ActiveRecord::Import::PostgreSQLAdapter
       if (options[:ignore] || options[:on_duplicate_key_ignore]) && !options[:on_duplicate_key_update] && !options[:recursive]
         sql << sql_for_on_duplicate_key_ignore( table_name, options[:on_duplicate_key_ignore] )
       end
-    elsif options[:on_duplicate_key_ignore] && !options[:on_duplicate_key_update]
+    elsif logger && options[:on_duplicate_key_ignore] && !options[:on_duplicate_key_update]
       logger.warn "Ignoring on_duplicate_key_ignore because it is not supported by the database."
     end
 
     sql += super(table_name, options)
 
     columns = returning_columns(options)
-    unless columns.blank? || options[:no_returning]
+    unless columns.blank? || (options[:no_returning] && !options[:recursive])
       sql << " RETURNING \"#{columns.join('", "')}\""
     end
 
@@ -195,8 +195,8 @@ module ActiveRecord::Import::PostgreSQLAdapter
     exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('duplicate key')
   end
 
-  def supports_on_duplicate_key_update?(current_version = postgresql_version)
-    current_version >= MIN_VERSION_FOR_UPSERT
+  def supports_on_duplicate_key_update?
+    database_version >= MIN_VERSION_FOR_UPSERT
   end
 
   def supports_setting_primary_key_of_imported_objects?
@@ -208,4 +208,10 @@ module ActiveRecord::Import::PostgreSQLAdapter
       results << "\"#{locking_column}\"=EXCLUDED.\"#{locking_column}\"+1"
     end
   end
+
+  private
+
+  def database_version
+    defined?(postgresql_version) ? postgresql_version : super
+  end
 end

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

@@ -9,16 +9,12 @@ module ActiveRecord::Import::SQLite3Adapter
   # Override our conformance to ActiveRecord::Import::ImportSupport interface
   # to ensure that we only support import in supported version of SQLite.
   # Which INSERT statements with multiple value sets was introduced in 3.7.11.
-  def supports_import?(current_version = sqlite_version)
-    if current_version >= MIN_VERSION_FOR_IMPORT
-      true
-    else
-      false
-    end
+  def supports_import?
+    database_version >= MIN_VERSION_FOR_IMPORT
   end
 
-  def supports_on_duplicate_key_update?(current_version = sqlite_version)
-    current_version >= MIN_VERSION_FOR_UPSERT
+  def supports_on_duplicate_key_update?
+    database_version >= MIN_VERSION_FOR_UPSERT
   end
 
   # +sql+ can be a single string or an array. If it is an array all
@@ -175,4 +171,10 @@ module ActiveRecord::Import::SQLite3Adapter
       results << "\"#{locking_column}\"=EXCLUDED.\"#{locking_column}\"+1"
     end
   end
+
+  private
+
+  def database_version
+    defined?(sqlite_version) ? sqlite_version : super
+  end
 end

data/lib/activerecord-import/base.rb

@@ -13,6 +13,7 @@ module ActiveRecord::Import
     when 'postgresql_makara' then 'postgresql'
     when 'makara_postgis' then 'postgresql'
     when 'postgis' then 'postgresql'
+    when 'cockroachdb' then 'postgresql'
     else adapter
     end
   end
@@ -26,7 +27,13 @@ module ActiveRecord::Import
 
   # Loads the import functionality for the passed in ActiveRecord connection
   def self.load_from_connection_pool(connection_pool)
-    require_adapter connection_pool.spec.config[:adapter]
+    adapter =
+      if connection_pool.respond_to?(:db_config) # ActiveRecord >= 6.1
+        connection_pool.db_config.adapter
+      else
+        connection_pool.spec.config[:adapter]
+      end
+    require_adapter adapter
   end
 end
 

data/lib/activerecord-import/import.rb

@@ -26,44 +26,53 @@ module ActiveRecord::Import #:nodoc:
   class Validator
     def initialize(klass, options = {})
       @options = options
+      @validator_class = klass
       init_validations(klass)
     end
 
     def init_validations(klass)
       @validate_callbacks = klass._validate_callbacks.dup
 
-      klass._validate_callbacks.each_with_index do |callback, i|
+      @validate_callbacks.each_with_index do |callback, i|
         filter = callback.raw_filter
+        next unless filter.class.name =~ /Validations::PresenceValidator/ ||
+                    (!@options[:validate_uniqueness] &&
+                     filter.is_a?(ActiveRecord::Validations::UniquenessValidator))
 
-        if filter.class.name =~ /Validations::PresenceValidator/
-          callback = callback.dup
-          filter = filter.dup
+        callback = callback.dup
+        filter = filter.dup
+        attrs = filter.instance_variable_get(:@attributes).dup
+
+        if filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
+          attrs = []
+        else
           associations = klass.reflect_on_all_associations(:belongs_to)
-          attrs = filter.instance_variable_get(:@attributes).dup
           associations.each do |assoc|
             if (index = attrs.index(assoc.name))
               key = assoc.foreign_key.to_sym
               attrs[index] = key unless attrs.include?(key)
             end
           end
-          filter.instance_variable_set(:@attributes, attrs)
-          if @validate_callbacks.respond_to?(:chain, true)
-            @validate_callbacks.send(:chain).tap do |chain|
-              callback.instance_variable_set(:@filter, filter)
-              chain[i] = callback
-            end
-          else
-            callback.raw_filter = filter
-            callback.filter = callback.send(:_compile_filter, filter)
-            @validate_callbacks[i] = callback
+        end
+
+        filter.instance_variable_set(:@attributes, attrs)
+
+        if @validate_callbacks.respond_to?(:chain, true)
+          @validate_callbacks.send(:chain).tap do |chain|
+            callback.instance_variable_set(:@filter, filter)
+            chain[i] = callback
           end
-        elsif !@options[:validate_uniqueness] && filter.is_a?(ActiveRecord::Validations::UniquenessValidator)
-          @validate_callbacks.delete(callback)
+        else
+          callback.raw_filter = filter
+          callback.filter = callback.send(:_compile_filter, filter)
+          @validate_callbacks[i] = callback
         end
       end
     end
 
     def valid_model?(model)
+      init_validations(model.class) unless model.class == @validator_class
+
       validation_context = @options[:validate_with_context]
       validation_context ||= (model.new_record? ? :create : :update)
       current_context = model.send(:validation_context)
@@ -522,7 +531,7 @@ class ActiveRecord::Base
         import_helper(*args)
       end
     end
-    alias import bulk_import unless respond_to? :import
+    alias import bulk_import unless ActiveRecord::Base.respond_to? :import
 
     # Imports a collection of values if all values are valid. Import fails at the
     # first encountered validation error and raises ActiveRecord::RecordInvalid
@@ -534,7 +543,7 @@ class ActiveRecord::Base
 
       bulk_import(*args, options)
     end
-    alias import! bulk_import! unless respond_to? :import!
+    alias import! bulk_import! unless ActiveRecord::Base.respond_to? :import!
 
     def import_helper( *args )
       options = { validate: true, timestamps: true }
@@ -568,15 +577,6 @@ class ActiveRecord::Base
           end
         end
 
-        default_values = column_defaults
-        stored_attrs = respond_to?(:stored_attributes) ? stored_attributes : {}
-        serialized_attrs = if defined?(ActiveRecord::Type::Serialized)
-          attrs = column_names.select { |c| type_for_attribute(c.to_s).class == ActiveRecord::Type::Serialized }
-          Hash[attrs.map { |a| [a, nil] }]
-        else
-          serialized_attributes
-        end
-
         update_attrs = if record_timestamps && options[:timestamps]
           if respond_to?(:timestamp_attributes_for_update, true)
             send(:timestamp_attributes_for_update).map(&:to_sym)
@@ -602,12 +602,8 @@ class ActiveRecord::Base
                update_attrs && update_attrs.include?(name.to_sym) &&
                !model.send("#{name}_changed?")
               nil
-            elsif stored_attrs.key?(name.to_sym) ||
-                  serialized_attrs.key?(name.to_s) ||
-                  default_values[name.to_s]
-              model.read_attribute(name.to_s)
             else
-              model.read_attribute_before_type_cast(name.to_s)
+              model.read_attribute(name.to_s)
             end
           end
         end
@@ -634,7 +630,7 @@ class ActiveRecord::Base
         end
         # supports empty array
       elsif args.last.is_a?( Array ) && args.last.empty?
-        return ActiveRecord::Import::Result.new([], 0, [])
+        return ActiveRecord::Import::Result.new([], 0, [], [])
         # supports 2-element array and array
       elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
 
@@ -862,7 +858,10 @@ class ActiveRecord::Base
       end
 
       models.each do |model|
-        if model.respond_to?(:clear_changes_information) # Rails 4.0 and higher
+        if model.respond_to?(:changes_applied) # Rails 4.1.8 and higher
+          model.changes_internally_applied if model.respond_to?(:changes_internally_applied) # legacy behavior for Rails 5.1
+          model.changes_applied
+        elsif model.respond_to?(:clear_changes_information) # Rails 4.0 and higher
           model.clear_changes_information
         else # Rails 3.2
           model.instance_variable_get(:@changed_attributes).clear
@@ -895,8 +894,9 @@ class ActiveRecord::Base
       associated_objects_by_class = {}
       models.each { |model| find_associated_objects_for_import(associated_objects_by_class, model) }
 
-      # :on_duplicate_key_update not supported for associations
+      # :on_duplicate_key_update and :returning not supported for associations
       options.delete(:on_duplicate_key_update)
+      options.delete(:returning)
 
       associated_objects_by_class.each_value do |associations|
         associations.each_value do |associated_records|
@@ -967,6 +967,8 @@ class ActiveRecord::Base
               val = column.type_cast(val) unless column.type.to_sym == :binary
               connection_memo.quote(val, column)
             end
+          else
+            raise ArgumentError, "Number of values (#{arr.length}) exceeds number of columns (#{columns.length})"
           end
         end
         "(#{my_values.join(',')})"

data/lib/activerecord-import/synchronize.rb

@@ -39,8 +39,8 @@ module ActiveRecord # :nodoc:
 
         next unless matched_instance
 
-        instance.send :clear_aggregation_cache
         instance.send :clear_association_cache
+        instance.send :clear_aggregation_cache if instance.respond_to?(:clear_aggregation_cache, true)
         instance.instance_variable_set :@attributes, matched_instance.instance_variable_get(:@attributes)
 
         if instance.respond_to?(:clear_changes_information)

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.28.1".freeze
+    VERSION = "1.0.3".freeze
   end
 end

data/test/import_test.rb

@@ -17,6 +17,11 @@ describe "#import" do
     assert_equal error.message, "Last argument should be a two dimensional array '[[]]'. First element in array was a String"
   end
 
+  it "warns you that you're passing more data than you ought to" do
+    error = assert_raise(ArgumentError) { Topic.import %w(title author_name), [['Author #1', 'Book #1', 0]] }
+    assert_equal error.message, "Number of values (8) exceeds number of columns (7)"
+  end
+
   it "should not produce an error when importing empty arrays" do
     assert_nothing_raised do
       Topic.import []

data/test/schema/postgresql_schema.rb

@@ -8,6 +8,7 @@ ActiveRecord::Schema.define do
     t.text :preferences
 
     if t.respond_to?(:json)
+      t.json :pure_json_data
       t.json :data
     else
       t.text :data
@@ -20,6 +21,7 @@ ActiveRecord::Schema.define do
     end
 
     if t.respond_to?(:jsonb)
+      t.jsonb :pure_jsonb_data
       t.jsonb :settings
       t.jsonb :json_data, null: false, default: {}
     else

data/test/support/postgresql/import_examples.rb

@@ -37,6 +37,12 @@ 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
+      end
+
       it "marks models as persisted" do
         assert !topic.new_record?
         assert topic.persisted?
@@ -110,6 +116,17 @@ def should_support_postgresql_import_functionality
         assert_equal [%w(King It)], result.results
       end
 
+      context "when given an empty array" do
+        let(:result) { Book.import([], returning: %w(title)) }
+
+        setup { result }
+
+        it "returns empty arrays for ids and results" do
+          assert_equal [], result.ids
+          assert_equal [], result.results
+        end
+      end
+
       context "when primary key and returning overlap" do
         let(:result) { Book.import(books, returning: %w(id title)) }
 
@@ -228,6 +245,19 @@ def should_support_postgresql_import_functionality
         assert_equal({}, Vendor.first.json_data)
       end
     end
+
+    %w(json jsonb).each do |json_type|
+      describe "with pure #{json_type} fields" do
+        let(:data) { { a: :b } }
+        let(:json_field_name) { "pure_#{json_type}_data" }
+        it "imports the values from saved records" do
+          vendor = Vendor.create!(name: 'Vendor 1', json_field_name => data)
+
+          Vendor.import [vendor], on_duplicate_key_update: [json_field_name]
+          assert_equal(data.as_json, vendor.reload[json_field_name])
+        end
+      end
+    end
   end
 
   describe "with binary field" do

data/test/support/shared_examples/recursive_import.rb

@@ -183,5 +183,34 @@ def should_support_recursive_import
         end
       end
     end
+
+    # If returning option is provided, it is only applied to top level models so that SQL with invalid
+    # columns, keys, etc isn't generated for child associations when doing recursive import
+    describe "returning" do
+      let(:new_topics) { Build(1, :topic_with_book) }
+
+      it "imports objects with associations" do
+        assert_difference "Topic.count", +1 do
+          Topic.import new_topics, recursive: true, returning: [:content], validate: false
+          new_topics.each do |topic|
+            assert_not_nil topic.id
+          end
+        end
+      end
+    end
+
+    # If no returning option is provided, it is ignored
+    describe "no returning" do
+      let(:new_topics) { Build(1, :topic_with_book) }
+
+      it "is ignored and imports objects with associations" do
+        assert_difference "Topic.count", +1 do
+          Topic.import new_topics, recursive: true, no_returning: true, validate: false
+          new_topics.each do |topic|
+            assert_not_nil topic.id
+          end
+        end
+      end
+    end
   end
 end

data/test/support/sqlite3/import_examples.rb

@@ -5,21 +5,8 @@ def should_support_sqlite3_import_functionality
   end
 
   describe "#supports_imports?" do
-    context "and SQLite is 3.7.11 or higher" do
-      it "supports import" do
-        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.11")
-        assert ActiveRecord::Base.supports_import?(version)
-
-        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.12")
-        assert ActiveRecord::Base.supports_import?(version)
-      end
-    end
-
-    context "and SQLite less than 3.7.11" do
-      it "doesn't support import" do
-        version = ActiveRecord::ConnectionAdapters::SQLite3Adapter::Version.new("3.7.10")
-        assert !ActiveRecord::Base.supports_import?(version)
-      end
+    it "should support import" do
+      assert ActiveRecord::Base.supports_import?
     end
   end
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.28.1
+  version: 1.0.3
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-04 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -75,6 +75,8 @@ files:
 - gemfiles/5.0.gemfile
 - gemfiles/5.1.gemfile
 - gemfiles/5.2.gemfile
+- gemfiles/6.0.gemfile
+- gemfiles/6.1.gemfile
 - lib/activerecord-import.rb
 - lib/activerecord-import/active_record/adapters/abstract_adapter.rb
 - lib/activerecord-import/active_record/adapters/jdbcmysql_adapter.rb
@@ -184,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord