activerecord-import 0.18.3 → 0.19.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 32bb7874255a2f1979d7fc370e46c9c614c362df
-  data.tar.gz: 7b45f6b4f22e64c032d320b34fa0989af63fb4aa
+  metadata.gz: 9a15b84eab5c3e37adc77106a0c55a8cb030d6d3
+  data.tar.gz: b2cab0765b2dcb2465dd6178a767836da1b61d65
 SHA512:
-  metadata.gz: fdba083a35bde877674eaadb6bccd5cb83d285370926ef8ca557f0fe3cef08912d011599513ef640f0e1f5bd3dcfd9d0bb0a6979040d08ae1424118035ef93b4
-  data.tar.gz: 570dc7bb80545e93cb00114ddf2f09795b410b402e3ba5cd3c3023fc18e974b53d7fc0b78a684440707b7fc7d9163fba84ea8df077d0a7214d2b0eb0556563df
+  metadata.gz: c70a9f7ea0ac30697a9342d3243b459a38fc78048ee7287b4172da5353939fd4fbb73567a9ab7c79b7b0ef9e3a367b8ea9c0e6ec78c89050db36964735fc4782
+  data.tar.gz: 1193d03b7d5ddb8cab84110a2d34c57df9a5c6fca2d38c9967d64dd0e9573d7b3c85a88c3448b3f5a6270a6ddafc459083e5fecd2d50a26a79d7c7c50184ce3a

data/CHANGELOG.md

@@ -1,3 +1,17 @@
+## Changes in 0.19.0
+
+### New Features
+
+* For PostgreSQL, add option to set WHERE condition in conflict_action. Thanks to
+  @Saidbek via \#423.
+
+### Fixes
+
+* Fix issue importing saved records with serialized fields. Thanks to
+  @Andreis13, @jkowens via \#425.
+* Fix issue importing records that have columns defined with default values
+  that are functions or expressions. Thanks to @Andreis13, @jkowens via \#428.
+
 ## Changes in 0.18.3
 
 ### Fixes

data/gemfiles/5.1.gemfile

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

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

@@ -87,10 +87,11 @@ module ActiveRecord::Import::PostgreSQLAdapter
     arg = { columns: arg } if arg.is_a?( Array ) || arg.is_a?( String )
     return unless arg.is_a?( Hash )
 
-    sql = " ON CONFLICT "
+    sql = ' ON CONFLICT '
     conflict_target = sql_for_conflict_target( arg )
 
     columns = arg.fetch( :columns, [] )
+    condition = arg[:condition]
     if columns.respond_to?( :empty? ) && columns.empty?
       return sql << "#{conflict_target}DO NOTHING"
     end
@@ -110,6 +111,9 @@ module ActiveRecord::Import::PostgreSQLAdapter
     else
       raise ArgumentError, 'Expected :columns to be an Array or Hash'
     end
+
+    sql << " WHERE #{condition}" if condition.present?
+
     sql
   end
 

data/lib/activerecord-import/import.rb

@@ -350,6 +350,15 @@ class ActiveRecord::Base
     #
     #   BlogPost.import columns, values, on_duplicate_key_update: { constraint_name: :blog_posts_pkey, columns: [ :date_modified ] }
     #
+    # ====== :condition
+    #
+    # The :condition attribute optionally specifies a WHERE condition
+    # on :conflict_action. Only rows for which this expression returns true will be updated.
+    # Note that it's evaluated last, after a conflict has been identified as a candidate to update.
+    # Below is an example:
+    #
+    #   BlogPost.import columns, values, on_duplicate_key_update: { conflict_target: [ :author_id ], condition: "blog_posts.title NOT LIKE '%sample%'", columns: [ :author_name ] }
+
     # ====== :columns
     #
     # The :columns attribute can be either an Array or a Hash.
@@ -426,13 +435,20 @@ class ActiveRecord::Base
           column_names.delete(primary_key)
         end
 
-        stored_attrs = respond_to?(:stored_attributes) ? stored_attributes : {}
         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
 
         array_of_attributes = models.map do |model|
           column_names.map do |name|
-            is_stored_attr = stored_attrs.any? && stored_attrs.key?(name.to_sym)
-            if is_stored_attr || default_values[name].is_a?(Hash)
+            if stored_attrs.key?(name.to_sym) ||
+               serialized_attrs.key?(name) ||
+               default_values.key?(name.to_s)
               model.read_attribute(name.to_s)
             else
               model.read_attribute_before_type_cast(name.to_s)

data/lib/activerecord-import/version.rb

@@ -1,5 +1,5 @@
 module ActiveRecord
   module Import
-    VERSION = "0.18.3".freeze
+    VERSION = "0.19.0".freeze
   end
 end

data/test/import_test.rb

@@ -692,6 +692,16 @@ describe "#import" do
       assert_equal(data.as_json, Widget.find_by_w_id(9).json_data)
     end
 
+    it "imports serialized values from saved records" do
+      Widget.import [:w_id, :json_data], [[1, data]]
+      assert_equal data.as_json, Widget.last.json_data
+
+      w = Widget.last
+      w.w_id = 2
+      Widget.import([w])
+      assert_equal data.as_json, Widget.last.json_data
+    end
+
     context "with a store" do
       it "imports serialized attributes set using accessors" do
         vendors = [Vendor.new(name: 'Vendor 1', color: 'blue')]

data/test/support/postgresql/import_examples.rb

@@ -273,6 +273,39 @@ def should_support_postgresql_upsert_functionality
           end
         end
 
+        context 'with :condition' do
+          let(:columns) { %w( id device_id alarm_type status metadata) }
+          let(:values) { [[99, 17, 1, 1, 'foo']] }
+          let(:updated_values) { [[99, 17, 1, 1, 'bar']] }
+
+          macro(:perform_import) do |*opts|
+            Alarm.import(
+              columns,
+              updated_values,
+              opts.extract_options!.merge(
+                on_duplicate_key_update: {
+                  conflict_target: [:id],
+                  condition: "alarms.metadata NOT LIKE '%foo%'",
+                  columns: [:metadata]
+                },
+                validate: false
+              )
+            )
+          end
+
+          macro(:updated_alarm) { Alarm.find(@alarm.id) }
+
+          setup do
+            Alarm.import columns, values, validate: false
+            @alarm = Alarm.find 99
+          end
+
+          it 'should not update fields not matched' do
+            perform_import
+            assert_equal 'foo', updated_alarm.metadata
+          end
+        end
+
         context "with :constraint_name" do
           let(:columns) { %w( id title author_name author_email_address parent_id ) }
           let(:values) { [[100, "Book", "John Doe", "john@doe.com", 17]] }

metadata

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