activerecord-import 1.0.1 → 1.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 641c8875527982cb5d4657eac796783d8f3875074ae0aff972fb675ad116d785
-  data.tar.gz: 613b7410d4c4134a3827462b9e41dde7cfd47fbce6b1079b20498d9aa3f36062
+  metadata.gz: 5448c6493533f39965a0b3cd0f00e3d2811e7f8feaa2f806e20b47d8db504c27
+  data.tar.gz: fde9e0e991022d01d339da3da9b89d0523771533fc684d3d955af91b718bede2
 SHA512:
-  metadata.gz: d25ac8e6af2a1f74df64431002a081afa5a3aebe7b21c3f08fb4b35774579dd59c3bffbbdd5300c6a03b8d709b02a88fa36aa0aff9c5811e1b630dbd46fc5911
-  data.tar.gz: 248155a8c56f09acf2ad22e178d29e1c93a4eac272c3a41f77d8f426304f4b1c63f62642360bde76a41683ec50a594a14d3ac4b9b09981788239b670bbfa0cfa
+  metadata.gz: 1048e6bb250eb8cedb71d37dad9e13245799638e948f83016e3301ea933418327fe294438ab862d0cf1c521da51fabd8ac648f16798d1f44a62cb4784176a60a
+  data.tar.gz: e764901dc217df8fb650a788064fcd274d7141e0a3e201ecc9011aa0ce5ce89ff7bb06d899543e084543bf52e54d8feb81c6a17d464e3a81b7df5ee187c2614d

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
 

data/CHANGELOG.md

@@ -1,3 +1,18 @@
+## 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

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 >= 5.1
 
 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

@@ -63,7 +63,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 +72,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!
 ```
@@ -88,10 +88,10 @@ columns = [ :title, :author ]
 values = [ ['Book1', 'FooManChu'], ['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
@@ -171,15 +171,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: "FooManChu"),
+  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 +189,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: "FooManChu"),
+  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 +217,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: "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")
 ]
 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 +237,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,7 +248,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.
@@ -383,7 +383,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 +397,7 @@ demo.ids
 
 demo.results
 => ["First Article", "Second Article"] # for Postgres
-=> [] for other DBs
+=> [] # for other DBs
 ```
 
 ### Counter Cache

data/gemfiles/6.0.gemfile

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

data/gemfiles/6.1.gemfile

@@ -0,0 +1 @@
+gem 'activerecord', '~> 6.1.0.alpha'

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/postgresql_adapter.rb

@@ -73,7 +73,7 @@ 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
 
@@ -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

data/lib/activerecord-import/import.rb

@@ -26,6 +26,7 @@ module ActiveRecord::Import #:nodoc:
   class Validator
     def initialize(klass, options = {})
       @options = options
+      @validator_class = klass
       init_validations(klass)
     end
 
@@ -70,6 +71,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)

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 = "1.0.1".freeze
+    VERSION = "1.0.2".freeze
   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: 1.0.1
+  version: 1.0.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-02-25 00:00:00.000000000 Z
+date: 2019-06-01 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.7.7
+rubygems_version: 2.7.8
 signing_key: 
 specification_version: 4
 summary: Bulk insert extension for ActiveRecord