activerecord-import 0.18.1 → 0.18.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 49847bc4a5b9c30133bb9a3ea8223906bcb65927
-  data.tar.gz: a4eeffe1ba579ccfe60f0e4e2e8ba7f641594aff
+  metadata.gz: 0ebf1fdae1a4d300498ed6ba18ea8d4039697734
+  data.tar.gz: 41e6dfff68a59c0fd9184691cbe6731cc420df8d
 SHA512:
-  metadata.gz: 4b862bf40ca9dc76c6980bca024e9001db7e5ec89cdcfb98860cf9710280a44db4587e51ef45d5212c0121bc2bd407e45d6bbf6e047bf2ac5f8256c6b7d29ea6
-  data.tar.gz: 4409b8fbf9ea44482496a22679029eaf80e5a411cda999624f4587436e68b26eb59be7e263d0f324c39c5156da97be6b49929efde6d6c7bcda7a9c153a17c49a
+  metadata.gz: ba3161f35e5521a4febe1a66e729f9a9c549620f54119992d87a834148dc3a42f9e28f3f4c4ca9fb722a0c73639ca678db6d9363325fe6e73a5fb61b58422c59
+  data.tar.gz: 4248f96c0adbd65300e1ba161ea91fcf707ac151523121ac9bc541d24cec8f32229bde28ac1783ea6ec69c1f3043f3ac5b5a06c094d2fe9f2c04f952128a0cf6

data/.travis.yml

@@ -27,9 +27,6 @@ matrix:
         - bundle exec rake test:jdbcmysql
         - bundle exec rake test:jdbcpostgresql
 
-  allow_failures:
-    - env: AR_VERSION=5.1
-
   fast_finish: true
 
 before_script:
@@ -47,6 +44,7 @@ addons:
       - travis-ci/sqlite3
     packages:
       - sqlite3
+      - postgresql-9.5-postgis-2.3
 
 script:
   - bundle exec rake test:mysql2
@@ -60,4 +58,4 @@ script:
   - bundle exec rake test:sqlite3
   - bundle exec rubocop
 
-sudo: required
+dist: trusty

data/CHANGELOG.md

@@ -1,3 +1,11 @@
+## Changes in 0.18.2
+
+### Fixes
+
+* Enable custom validate callbacks when validating import. Thanks to @afn via \#410.
+* Prevent wrong IDs being set on models when using :on_duplicate_key_ignore.
+  Thanks to @afn, @jkowens via \#412.
+
 ## Changes in 0.18.1
 
 ### Fixes

data/Gemfile

@@ -12,7 +12,7 @@ platforms :ruby do
   gem "mysql2",                 "~> 0.3.0"
   gem "pg",                     "~> 0.9"
   gem "sqlite3",                "~> 1.3.10"
-  gem "seamless_database_pool", "~> 1.0.18"
+  gem "seamless_database_pool", "~> 1.0.20"
 end
 
 platforms :jruby do

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

@@ -50,7 +50,7 @@ module ActiveRecord::Import::PostgreSQLAdapter
 
     sql += super(table_name, options)
 
-    unless options[:no_returning] || options[:primary_key].blank?
+    unless options[:primary_key].blank? || options[:no_returning]
       primary_key = Array(options[:primary_key])
       sql << " RETURNING \"#{primary_key.join('", "')}\""
     end

data/lib/activerecord-import/import.rb

@@ -24,9 +24,8 @@ module ActiveRecord::Import #:nodoc:
   end
 
   class Validator
-    def initialize(validators, options = {})
-      @validators = validators
-      @options    = options
+    def initialize(options = {})
+      @options = options
     end
 
     def valid_model?(model)
@@ -34,38 +33,47 @@ module ActiveRecord::Import #:nodoc:
       validation_context ||= (model.new_record? ? :create : :update)
 
       current_context = model.send(:validation_context)
-      model.send(:validation_context=, validation_context)
-      model.errors.clear
+      begin
+        model.send(:validation_context=, validation_context)
+        model.errors.clear
 
-      validation_proc = lambda do
-        @validators.each do |v|
-          if validation_context == v.options.fetch(:on, validation_context)
-            v.validate(model) if validate?(v, model)
-          end
+        validate_callbacks = model._validate_callbacks.dup
+        validate_callbacks.each do |callback|
+          validate_callbacks.delete(callback) if callback.raw_filter.is_a? ActiveRecord::Validations::UniquenessValidator
         end
-      end
-
-      if model.respond_to?(:run_validation_callbacks)
-        model.send(:_run_validation_callbacks, &validation_proc)
-      else
-        model.send(:run_callbacks, :validation, &validation_proc)
-      end
-
-      model.send(:validation_context=, current_context)
-      model.errors.empty?
-    end
 
-    def validate?(validator, model)
-      evaluate = lambda do |condition|
-        case condition
-        when String then model.instance_eval(condition)
-        when Symbol then model.send(condition)
-        when Proc then model.instance_eval(&condition)
+        model.run_callbacks(:validation) do
+          if defined?(ActiveSupport::Callbacks::Filters::Environment) # ActiveRecord >= 4.1
+            runner = validate_callbacks.compile
+            env = ActiveSupport::Callbacks::Filters::Environment.new(model, false, nil)
+            if runner.respond_to?(:call) # ActiveRecord < 5.1
+              runner.call(env)
+            else # ActiveRecord 5.1
+              # Note that this is a gross simplification of ActiveSupport::Callbacks#run_callbacks.
+              # It's technically possible for there to exist an "around" callback in the
+              # :validate chain, but this would be an aberration, since Rails doesn't define
+              # "around_validate". Still, rather than silently ignoring such callbacks, we
+              # explicitly raise a RuntimeError, since activerecord-import was asked to perform
+              # validations and it's unable to do so.
+              #
+              # The alternative here would be to copy-and-paste the bulk of the
+              # ActiveSupport::Callbacks#run_callbacks method, which is undesirable if there's
+              # no real-world use case for it.
+              raise "The :validate callback chain contains an 'around' callback, which is unsupported" unless runner.final?
+              runner.invoke_before(env)
+              runner.invoke_after(env)
+            end
+          elsif validate_callbacks.method(:compile).arity == 0 # ActiveRecord = 4.0
+            model.instance_eval validate_callbacks.compile
+          else # ActiveRecord 3.x
+            model.instance_eval validate_callbacks.compile(nil, model)
+          end
         end
-      end
 
-      Array(validator.options[:if]).map(&evaluate).compact.all? &&
-        !Array(validator.options[:unless]).map(&evaluate).compact.any?
+        model.errors.empty?
+      ensure
+        model.send(:validation_context=, current_context)
+      end
     end
   end
 end
@@ -212,7 +220,9 @@ class ActiveRecord::Base
     #    records that contain duplicate keys. 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.
+    #    recursive import. For database adapters that normally support
+    #    setting primary keys on imported objects, this option prevents
+    #    that from occurring.
     # * +on_duplicate_key_update+ - an Array or Hash, tells import to
     #    use MySQL's ON DUPLICATE KEY UPDATE or Postgres 9.5+ ON CONFLICT
     #    DO UPDATE ability. See On Duplicate Key Update below.
@@ -511,7 +521,9 @@ class ActiveRecord::Base
 
       # if we have ids, then set the id on the models and mark the models as clean.
       if models && support_setting_primary_key_of_imported_objects?
-        set_attributes_and_mark_clean(models, return_obj, timestamps)
+        if options[:recursive] || !(options[:ignore] || options[:on_duplicate_key_ignore])
+          set_attributes_and_mark_clean(models, return_obj, timestamps)
+        end
 
         # if there are auto-save associations on the models we imported that are new, import them as well
         import_associations(models, options.dup) if options[:recursive]
@@ -530,8 +542,7 @@ class ActiveRecord::Base
     def import_with_validations( column_names, array_of_attributes, options = {} )
       failed_instances = []
 
-      validators = self.validators.reject { |v| v.is_a? ActiveRecord::Validations::UniquenessValidator }
-      validator = ActiveRecord::Import::Validator.new(validators, options)
+      validator = ActiveRecord::Import::Validator.new(options)
 
       if block_given?
         yield validator, failed_instances
@@ -700,8 +711,8 @@ class ActiveRecord::Base
     # Returns SQL the VALUES for an INSERT statement given the passed in +columns+
     # and +array_of_attributes+.
     def values_sql_for_columns_and_attributes(columns, array_of_attributes) # :nodoc:
-      # connection and type_caster get called a *lot* in this high intensity loop.
-      # Reuse the same ones w/in the loop, otherwise they would keep being re-retreived (= lots of time for large imports)
+      # connection gets called a *lot* in this high intensity loop.
+      # Reuse the same one w/in the loop, otherwise it would keep being re-retreived (= lots of time for large imports)
       connection_memo = connection
 
       array_of_attributes.map do |arr|

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.18.1".freeze
+    VERSION = "0.18.2".freeze
   end
 end

data/test/import_test.rb

@@ -168,6 +168,15 @@ describe "#import" do
         end
       end
 
+      it "should not alter the callback chain of the model" do
+        attributes = columns.zip(valid_values.first).to_h
+        topic = Topic.new attributes
+        Topic.import [topic], validate: true
+        duplicate_topic = Topic.new attributes
+        Topic.import [duplicate_topic], validate: true
+        assert duplicate_topic.invalid?
+      end
+
       it "should not import invalid data" do
         assert_no_difference "Topic.count" do
           Topic.import columns, invalid_values, validate: true
@@ -230,6 +239,12 @@ describe "#import" do
           Topic.import columns, [["invalid", "Jerry Carter"]], validate: true
         end
       end
+
+      it "should call validation methods" do
+        assert_no_difference "Topic.count" do
+          Topic.import columns, [["validate_failed", "Jerry Carter"]], validate: true
+        end
+      end
     end
   end
 

data/test/models/topic.rb

@@ -3,6 +3,7 @@ class Topic < ActiveRecord::Base
   validates :title, numericality: { only_integer: true }, on: :context_test
   validates :title, uniqueness: true
 
+  validate -> { errors.add(:title, :validate_failed) if title == 'validate_failed' }
   before_validation -> { errors.add(:title, :invalid) if title == 'invalid' }
 
   has_many :books, inverse_of: :topic

data/test/support/shared_examples/on_duplicate_key_ignore.rb

@@ -8,7 +8,9 @@ def should_support_on_duplicate_key_ignore
       it "should skip duplicates and continue import" do
         topics << Topic.new(title: "Book 2", author_name: "Jane Doe")
         assert_difference "Topic.count", +1 do
-          Topic.import topics, on_duplicate_key_ignore: true, validate: false
+          result = Topic.import topics, on_duplicate_key_ignore: true, validate: false
+          assert_not_equal topics.first.id, result.ids.first
+          assert_nil topics.last.id
         end
       end
 
@@ -31,7 +33,9 @@ def should_support_on_duplicate_key_ignore
       it "should skip duplicates and continue import" do
         topics << Topic.new(title: "Book 2", author_name: "Jane Doe")
         assert_difference "Topic.count", +1 do
-          Topic.import topics, ignore: true, validate: false
+          result = Topic.import topics, ignore: true, validate: false
+          assert_not_equal topics.first.id, result.ids.first
+          assert_nil topics.last.id
         end
       end
     end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.18.1
+  version: 0.18.2
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2017-04-18 00:00:00.000000000 Z
+date: 2017-05-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord