activerecord-import 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5448c6493533f39965a0b3cd0f00e3d2811e7f8feaa2f806e20b47d8db504c27
-  data.tar.gz: fde9e0e991022d01d339da3da9b89d0523771533fc684d3d955af91b718bede2
+  metadata.gz: b9bf4dc4ecf93b15a493cc34134158d7df3d6391b2e6c7fafbe79b630df48ea3
+  data.tar.gz: ab5f7f4707598308dc9a2e7d4be5816f1d5674f63cea58e48b29f6ed87fa059a
 SHA512:
-  metadata.gz: 1048e6bb250eb8cedb71d37dad9e13245799638e948f83016e3301ea933418327fe294438ab862d0cf1c521da51fabd8ac648f16798d1f44a62cb4784176a60a
-  data.tar.gz: e764901dc217df8fb650a788064fcd274d7141e0a3e201ecc9011aa0ce5ce89ff7bb06d899543e084543bf52e54d8feb81c6a17d464e3a81b7df5ee187c2614d
+  metadata.gz: 05c4ad6281d6f0f574ee30cffed790763fb393fdf906ecc20bb8b4504f640ef9734ea1a43284f9821e543f8900aa3023bf66bcf455afcb2419e15828da618a05
+  data.tar.gz: cdc67be0552c3b32a980598a784964df98549a27d428b89ef3ed7385acb4c75681946e010e714770ac81ff076088c0293e26bc04bbc2e15aecd42bf86c3aecc8

data/.travis.yml

@@ -37,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
@@ -65,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,15 @@
+## 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

data/Gemfile

@@ -7,7 +7,7 @@ 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 >= 5.1
+sqlite3_version = '1.4.0' if version >= 6.0
 
 group :development, :test do
   gem 'rubocop', '~> 0.40.0'

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
 
@@ -85,7 +86,7 @@ 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
@@ -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
@@ -119,7 +120,7 @@ The `import` method can take an array of column names and an array of hash objec
 
 ```ruby
 books = [
-  { title: "Book 1", author: "FooManChu" },
+  { title: "Book 1", author: "George Orwell" },
   { title: "Book 2", author: "Bob Jones" }
 ]
 columns = [ :title ]
@@ -171,7 +172,7 @@ 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 1", author: "George Orwell"),
   Book.new(title: "Book 2", author: "Bob Jones")
 ]
 
@@ -189,7 +190,7 @@ 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 1", author: "George Orwell"),
   Book.new(title: "Book 2", author: "Bob Jones")
 ]
 columns = [ :title ]
@@ -217,7 +218,7 @@ 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 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")
@@ -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)
 ```
@@ -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

@@ -1 +1 @@
-gem 'activerecord', '~> 6.0.0.rc1'
+gem 'activerecord', '~> 6.0.0'

data/gemfiles/6.1.gemfile

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

data/lib/activerecord-import/base.rb

@@ -27,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

@@ -630,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 )
 

data/lib/activerecord-import/version.rb

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

data/test/support/postgresql/import_examples.rb

@@ -116,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)) }
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.3
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-06-01 00:00:00.000000000 Z
+date: 2019-10-09 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -186,7 +186,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.8
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord