activerecord-import 0.14.1 → 0.15.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: e0eab7d65f5982398dc619a9b74658f8686fca73
-  data.tar.gz: e2eee39f139a44acf97c11f84a834c70e1833418
+  metadata.gz: 7c1b3ac9675567f96311618bfcf008c344559183
+  data.tar.gz: 796d923d2db2f0317c832081e2ea336b9f933a7c
 SHA512:
-  metadata.gz: 4b12aea6f47a5f45920c58a227a1f62f445f9fb7f33e7226c17c1c3c0bfc0d680bac38d24342bcb3aa847f46c15cddfa1a8f10cc9e946ca0ba52e0ea43afced7
-  data.tar.gz: 7ebeae0718cc45a693d986db6f544eadad3c10dcff580403634afbbcd87074cca999a67cf960ed5bb0b438d77737cf09154b88ff701b1068c70cd3a4586a46c7
+  metadata.gz: 17a0387cd93c752b91f8cee9bf0fa311463e927debf83141a759e277d5e632aa7f468fa0b36a082d54adad0596cae40f31002f699b6189c0b00ce1b072e666c9
+  data.tar.gz: 587d1a167feb65558bf10208404a23bc409c6a4f48e8dd64cc32e0e2af76e1f9b81247a17658c47de102d29a0b8b4619a021d1b78bde61aa00fa5403b38c2aaa

data/CHANGELOG.md

@@ -1,8 +1,24 @@
+## Changes in 0.15.0
+
+### New Features
+
+* An ArgumentError is now raised if when no `conflict_target` or `conflict_name` is provided or can be determined when using the `on_duplicate_key_update` option for PostgreSQL. Thanks to @jkowens via \#290
+* Support for Rails 5.0 final release for all except the JDBC driver which is not yet updated to support Rails 5.0
+
+### Fixes
+
+* activerecord-import no longer modifies a value array inside of the given values array when called with `import(columns, values)`. Thanks to @jkowens via \#291
+
+### Misc
+
+* `raise_error` is used to raise errors for ActiveRecord 5.0. Thanks to @couragecourag via \#294 `raise_record_invalid` has been
+
+
 ## Changes in 0.14.1
 
 ### Fixes
 
-* JRuby/JDBCDriver with PostgreSQL will no longer raise a JDBCDriver error when using the :no_returning boolean option. Thanks to  @jkowens via \#287
+* JRuby/JDBCDriver with PostgreSQL will no longer raise a JDBCDriver error when using the :no_returning boolean option. Thanks to @jkowens via \#287
 
 ## Changes in 0.14.0
 
@@ -26,7 +42,6 @@
 * Code cleanup, removal of deprecated `alias_method_chain`. Thanks to @codeodor via \#271
 
 
-
 ## Changes in 0.13.0
 
 ### New Features

data/gemfiles/4.2.gemfile

@@ -1,3 +1,7 @@
 platforms :ruby do
   gem 'activerecord', '~> 4.2.0'
 end
+
+platforms :jruby do
+  gem 'activerecord', '~> 4.2.0'
+end

data/gemfiles/5.0.gemfile

@@ -1,3 +1,3 @@
 platforms :ruby do
-  gem 'activerecord', '~> 5.0.0.beta3'
+  gem 'activerecord', '~> 5.0.0'
 end

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

@@ -113,15 +113,16 @@ module ActiveRecord::Import::PostgreSQLAdapter
   def sql_for_conflict_target( args = {} )
     constraint_name = args[:constraint_name]
     conflict_target = args[:conflict_target]
-    if constraint_name
+    if constraint_name.present?
       "ON CONSTRAINT #{constraint_name} "
-    elsif conflict_target
-      '(' << Array( conflict_target ).join( ', ' ) << ') '
+    elsif conflict_target.present?
+      '(' << Array( conflict_target ).reject( &:empty? ).join( ', ' ) << ') '
     end
   end
 
   def sql_for_default_conflict_target( table_name )
-    "(#{primary_key( table_name )}) "
+    conflict_target = primary_key( table_name )
+    "(#{conflict_target}) " if conflict_target
   end
 
   # Return true if the statement is a duplicate key record error

data/lib/activerecord-import/import.rb

@@ -367,13 +367,13 @@ class ActiveRecord::Base
         # supports 2-element array and array
       elsif args.size == 2 && args.first.is_a?( Array ) && args.last.is_a?( Array )
         column_names, array_of_attributes = args
+        array_of_attributes = array_of_attributes.map(&:dup)
       else
         raise ArgumentError, "Invalid arguments!"
       end
 
       # dup the passed in array so we don't modify it unintentionally
       column_names = column_names.dup
-      array_of_attributes = array_of_attributes.dup
 
       # Force the primary key col into the insert if it's not
       # on the list and we are using a sequence and stuff a nil
@@ -394,7 +394,11 @@ class ActiveRecord::Base
             models.each_with_index do |model, i|
               model = model.dup if options[:recursive]
               next if model.valid?(options[:validate_with_context])
-              model.send(:raise_record_invalid) if options[:raise_error]
+              if options[:raise_error] && model.respond_to?(:raise_validation_error, true) # Rails 5.0 and higher
+                model.send(:raise_validation_error)
+              elsif options[:raise_error] # Rails 3.2, 4.0, 4.1 and 4.2
+                model.send(:raise_record_invalid)
+              end
               array_of_attributes[i] = nil
               failed << model
             end

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.14.1".freeze
+    VERSION = "0.15.0".freeze
   end
 end

data/test/import_test.rb

@@ -29,7 +29,8 @@ describe "#import" do
 
     it "should not modify the passed in values array" do
       assert_nothing_raised do
-        values = [%w(foo bar)].freeze
+        record = %w(foo bar).freeze
+        values = [record].freeze
         Topic.import %w(title author_name), values
       end
     end

data/test/support/postgresql/import_examples.rb

@@ -170,27 +170,56 @@ def should_support_postgresql_upsert_functionality
           should_update_fields_mentioned
         end
 
-        context "with no :conflict_target or :constraint_name" do
+        context "default to the primary key" do
           let(:columns) { %w( id title author_name author_email_address parent_id ) }
           let(:values) { [[100, "Book", "John Doe", "john@doe.com", 17]] }
           let(:updated_values) { [[100, "Book - 2nd Edition", "Author Should Not Change", "johndoe@example.com", 57]] }
-
-          macro(:perform_import) do |*opts|
-            Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { columns: update_columns }, validate: false)
-          end
+          let(:update_columns) { [:title, :author_email_address, :parent_id] }
 
           setup do
             Topic.import columns, values, validate: false
             @topic = Topic.find 100
           end
 
-          context "default to the primary key" do
-            let(:update_columns) { [:title, :author_email_address, :parent_id] }
+          context "with no :conflict_target or :constraint_name" do
+            macro(:perform_import) do |*opts|
+              Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { columns: update_columns }, validate: false)
+            end
+
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "with empty value for :conflict_target" do
+            macro(:perform_import) do |*opts|
+              Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { conflict_target: [], columns: update_columns }, validate: false)
+            end
+
+            should_support_on_duplicate_key_update
+            should_update_fields_mentioned
+          end
+
+          context "with empty value for :constraint_name" do
+            macro(:perform_import) do |*opts|
+              Topic.import columns, updated_values, opts.extract_options!.merge(on_duplicate_key_update: { constraint_name: '', columns: update_columns }, validate: false)
+            end
+
             should_support_on_duplicate_key_update
             should_update_fields_mentioned
           end
         end
 
+        context "with no :conflict_target or :constraint_name" do
+          context "with no primary key" do
+            it "raises ArgumentError" do
+              error = assert_raises ArgumentError do
+                Widget.import Build(1, :widgets), on_duplicate_key_update: [:data], validate: false
+              end
+              assert_match(/Expected :conflict_target or :constraint_name to be specified/, error.message)
+            end
+          end
+        end
+
         context "with no :columns" do
           let(:columns) { %w( id title author_name author_email_address ) }
           let(:values) { [[100, "Book", "John Doe", "john@doe.com"]] }

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-import
 version: !ruby/object:Gem::Version
-  version: 0.14.1
+  version: 0.15.0
 platform: ruby
 authors:
 - Zach Dennis
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-06-22 00:00:00.000000000 Z
+date: 2016-07-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord