activerecord-import 0.28.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA1:
-  metadata.gz: 39f2e5b83b07075c09bba10e3c9a53953b484641
-  data.tar.gz: 28869f9586c6200e932a34dadbed9f4790ee820d
+SHA256:
+  metadata.gz: cbf4c01d6a3f043ed541f7331d6a19e651cbc035fcc3030b17f1e741a6d4e8b7
+  data.tar.gz: a740491de16c78d4d94ccb428c69342fd8a809f235ce9d42fc41237a4d15c7e6
 SHA512:
-  metadata.gz: dad31c1f3f11c1b6ba63cf2c5e65d71713603cb7604cac06e35d2786f34394e88a2ad69bc76fcaf14d7cd90e84fa277e84427425aa27cd0bcb65c61024990e1a
-  data.tar.gz: e842906754fd995d1be896e7929213919426ccf9c107f06c996c0216b9331c3232ff85ceb622c9de4678de6ff639e22ee783c5482bb9fbdb8c5740df46d55304
+  metadata.gz: 48e62637f6493cd5446cd78aee3db3b4a58e646fb0bc07d3583a662f89f52b03c2a079c83fc2cae807c5577f922e1e3219354cf36dff8ae8cc81ae68266e711f
+  data.tar.gz: 2f40f5fd61975589f8af932a3dbf5b6d14d2cfc6884ebe7019c85956c8c380d3faebffb1b600a7fa04536fe262ed40688946c8d35b8cf5b1bfedd1ddff20af5a

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,71 @@
+## Changes in 1.0.4
+
+### Fixes
+
+* Use prepend pattern for ActiveRecord::Base#establish_connection patching. Thanks to @dombesz via \#648.
+* Fix NoMethodError when using PostgreSQL ENUM types. Thanks to @sebcoetzee via \#651.
+* Fix issue updating optimistic lock in Postgres. Thanks to @timanovsky
+  via \#656.
+
+## 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

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 <code>has_many</code> 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,8 +249,9 @@ 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`).
+: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. 
 :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.
 :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.
@@ -257,8 +259,8 @@ Key                     | Options               | Default            | Descripti
 :timestamps             | `true`/`false`        | `true`             | Enables/disables timestamps on imported records.
 :recursive              | `true`/`false`        | `false`            | Imports has_many/has_one associations (PostgreSQL only).
 :batch_size             | `Integer`             | total # of records | Max number of records to insert per import
-:raise_error            | `true`/`false`        | `false`            | Throws an exception if there are invalid records. `import!` is a shortcut for this.
-
+: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.
 
 #### Duplicate Key Ignore
 
@@ -267,14 +269,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 +292,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 +306,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 +330,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 +351,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 +365,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 +385,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 +399,7 @@ demo.ids
 
 demo.results
 => ["First Article", "Second Article"] # for Postgres
-=> [] for other DBs
+=> [] # for other DBs
 ```
 
 ### Counter Cache
@@ -552,7 +554,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 +581,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 +607,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 +618,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
 
@@ -59,8 +59,14 @@ module ActiveRecord::Import::AbstractAdapter
       post_sql_statements
     end
 
+    def increment_locking_column!(table_name, results, locking_column)
+      if locking_column.present?
+        results << "\"#{locking_column}\"=#{table_name}.\"#{locking_column}\"+1"
+      end
+    end
+
     def supports_on_duplicate_key_update?
-      false
+      true
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module ActiveRecord::Import::MysqlAdapter
   include ActiveRecord::Import::ImportSupport
-  include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
 
   NO_MAX_PACKET = 0
   QUERY_OVERHEAD = 8 # This was shown to be true for MySQL, but it's not clear where the overhead is from.
@@ -71,14 +70,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
 
@@ -105,7 +101,7 @@ module ActiveRecord::Import::MysqlAdapter
       qc = quote_column_name( column )
       "#{table_name}.#{qc}=VALUES(#{qc})"
     end
-    increment_locking_column!(results, table_name, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',' )
   end
 
@@ -115,7 +111,7 @@ module ActiveRecord::Import::MysqlAdapter
       qc2 = quote_column_name( column2 )
       "#{table_name}.#{qc1}=VALUES( #{qc2} )"
     end
-    increment_locking_column!(results, table_name, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',')
   end
 
@@ -124,9 +120,9 @@ module ActiveRecord::Import::MysqlAdapter
     exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('Duplicate entry')
   end
 
-  def increment_locking_column!(results, table_name, locking_column)
+  def increment_locking_column!(table_name, results, locking_column)
     if locking_column.present?
-      results << "#{table_name}.`#{locking_column}`=`#{locking_column}`+1"
+      results << "`#{locking_column}`=#{table_name}.`#{locking_column}`+1"
     end
   end
 end

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

@@ -1,6 +1,5 @@
 module ActiveRecord::Import::PostgreSQLAdapter
   include ActiveRecord::Import::ImportSupport
-  include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
 
   MIN_VERSION_FOR_UPSERT = 90_500
 
@@ -19,7 +18,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 +72,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
 
@@ -158,7 +157,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
       qc = quote_column_name( column )
       "#{qc}=EXCLUDED.#{qc}"
     end
-    increment_locking_column!(results, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',' )
   end
 
@@ -168,7 +167,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
       qc2 = quote_column_name( column2 )
       "#{qc1}=EXCLUDED.#{qc2}"
     end
-    increment_locking_column!(results, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',' )
   end
 
@@ -195,17 +194,17 @@ 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?
     true
   end
 
-  def increment_locking_column!(results, locking_column)
-    if locking_column.present?
-      results << "\"#{locking_column}\"=EXCLUDED.\"#{locking_column}\"+1"
-    end
+  private
+
+  def database_version
+    defined?(postgresql_version) ? postgresql_version : super
   end
 end

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

@@ -1,6 +1,5 @@
 module ActiveRecord::Import::SQLite3Adapter
   include ActiveRecord::Import::ImportSupport
-  include ActiveRecord::Import::OnDuplicateKeyUpdateSupport
 
   MIN_VERSION_FOR_IMPORT = "3.7.11".freeze
   MIN_VERSION_FOR_UPSERT = "3.24.0".freeze
@@ -9,16 +8,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
@@ -96,7 +91,7 @@ module ActiveRecord::Import::SQLite3Adapter
 
   # Returns a generated ON CONFLICT DO UPDATE statement given the passed
   # in +args+.
-  def sql_for_on_duplicate_key_update( _table_name, *args ) # :nodoc:
+  def sql_for_on_duplicate_key_update( table_name, *args ) # :nodoc:
     arg, primary_key, locking_column = args
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
@@ -117,9 +112,9 @@ module ActiveRecord::Import::SQLite3Adapter
 
     sql << "#{conflict_target}DO UPDATE SET "
     if columns.is_a?( Array )
-      sql << sql_for_on_duplicate_key_update_as_array( locking_column, columns )
+      sql << sql_for_on_duplicate_key_update_as_array( table_name, locking_column, columns )
     elsif columns.is_a?( Hash )
-      sql << sql_for_on_duplicate_key_update_as_hash( locking_column, columns )
+      sql << sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, columns )
     elsif columns.is_a?( String )
       sql << columns
     else
@@ -131,22 +126,22 @@ module ActiveRecord::Import::SQLite3Adapter
     sql
   end
 
-  def sql_for_on_duplicate_key_update_as_array( locking_column, arr ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_array( table_name, locking_column, arr ) # :nodoc:
     results = arr.map do |column|
       qc = quote_column_name( column )
       "#{qc}=EXCLUDED.#{qc}"
     end
-    increment_locking_column!(results, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',' )
   end
 
-  def sql_for_on_duplicate_key_update_as_hash( locking_column, hsh ) # :nodoc:
+  def sql_for_on_duplicate_key_update_as_hash( table_name, locking_column, hsh ) # :nodoc:
     results = hsh.map do |column1, column2|
       qc1 = quote_column_name( column1 )
       qc2 = quote_column_name( column2 )
       "#{qc1}=EXCLUDED.#{qc2}"
     end
-    increment_locking_column!(results, locking_column)
+    increment_locking_column!(table_name, results, locking_column)
     results.join( ',' )
   end
 
@@ -170,9 +165,9 @@ module ActiveRecord::Import::SQLite3Adapter
     exception.is_a?(ActiveRecord::StatementInvalid) && exception.to_s.include?('duplicate key')
   end
 
-  def increment_locking_column!(results, locking_column)
-    if locking_column.present?
-      results << "\"#{locking_column}\"=EXCLUDED.\"#{locking_column}\"+1"
-    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

@@ -11,12 +11,6 @@ module ActiveRecord::Import #:nodoc:
     end
   end
 
-  module OnDuplicateKeyUpdateSupport #:nodoc:
-    def supports_on_duplicate_key_update? #:nodoc:
-      true
-    end
-  end
-
   class MissingColumnError < StandardError
     def initialize(name, index)
       super "Missing column for value <#{name}> at index #{index}"
@@ -26,6 +20,7 @@ module ActiveRecord::Import #:nodoc:
   class Validator
     def initialize(klass, options = {})
       @options = options
+      @validator_class = klass
       init_validations(klass)
     end
 
@@ -70,6 +65,8 @@ module ActiveRecord::Import #:nodoc:
     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)
@@ -242,16 +239,16 @@ class ActiveRecord::Associations::CollectionAssociation
   alias import bulk_import unless respond_to? :import
 end
 
+module ActiveRecord::Import::Connection
+  def establish_connection(args = nil)
+    super(args)
+    ActiveRecord::Import.load_from_connection_pool connection_pool
+  end
+end
+
 class ActiveRecord::Base
   class << self
-    def establish_connection_with_activerecord_import(*args)
-      conn = establish_connection_without_activerecord_import(*args)
-      ActiveRecord::Import.load_from_connection_pool connection_pool
-      conn
-    end
-
-    alias establish_connection_without_activerecord_import establish_connection
-    alias establish_connection establish_connection_with_activerecord_import
+    prepend ActiveRecord::Import::Connection
 
     # Returns true if the current database connection adapter
     # supports import functionality, otherwise returns false.
@@ -528,7 +525,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
@@ -540,7 +537,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 }
@@ -574,15 +571,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)
@@ -608,12 +596,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
@@ -640,7 +624,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 )
 
@@ -868,7 +852,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
@@ -901,8 +888,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|
@@ -970,9 +958,11 @@ class ActiveRecord::Base
                 val = serialized_attributes[column.name].dump(val)
               end
               # Fixes #443 to support binary (i.e. bytea) columns on PG
-              val = column.type_cast(val) unless column.type.to_sym == :binary
+              val = column.type_cast(val) unless column.type && 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.2".freeze
+    VERSION = "1.0.4".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

@@ -3,11 +3,23 @@ ActiveRecord::Schema.define do
   execute('CREATE extension IF NOT EXISTS "pgcrypto";')
   execute('CREATE extension IF NOT EXISTS "uuid-ossp";')
 
+  # 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
+    execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'wholesaler\';')
+    execute('ALTER TYPE vendor_type ADD VALUE IF NOT EXISTS \'retailer\';')
+  end
+
   create_table :vendors, id: :uuid, force: :cascade do |t|
     t.string :name, null: true
     t.text :preferences
 
     if t.respond_to?(:json)
+      t.json :pure_json_data
       t.json :data
     else
       t.text :data
@@ -20,6 +32,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
@@ -27,6 +40,8 @@ ActiveRecord::Schema.define do
       t.text :json_data
     end
 
+    t.column :vendor_type, :vendor_type
+
     t.datetime :created_at
     t.datetime :updated_at
   end

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,30 @@ 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 enum field" do
+    let(:vendor_type) { "retailer" }
+    it "imports the correct values for enum fields" do
+      vendor = Vendor.new(name: 'Vendor 1', vendor_type: vendor_type)
+      assert_difference "Vendor.count", +1 do
+        Vendor.import [vendor]
+      end
+      assert_equal(vendor_type, Vendor.first.vendor_type)
+    end
   end
 
   describe "with binary field" do

data/test/support/shared_examples/on_duplicate_key_update.rb

@@ -73,6 +73,16 @@ def should_support_basic_on_duplicate_key_update
             assert_equal user.name, users[i].name + ' Rothschild'
             assert_equal 1, user.lock_version
           end
+          updated_values2 = User.all.map do |user|
+            user.name += ' jr.'
+            { id: user.id, name: user.name }
+          end
+          User.import(updated_values2, on_duplicate_key_update: [:name])
+          assert User.count == updated_values2.length
+          User.all.each_with_index do |user, i|
+            assert_equal user.name, users[i].name + ' Rothschild jr.'
+            assert_equal 2, user.lock_version
+          end
         end
 
         it 'upsert optimistic lock columns other than lock_version by model' 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.2
+  version: 1.0.4
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-01-29 00:00:00.000000000 Z
+date: 2019-12-24 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
@@ -183,8 +185,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.6.11
+rubygems_version: 3.0.6
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord