active_record_upsert 0.7.4 → 0.8.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e867ac92d0f9da516a6845e3ebd2fc03da038ae5451e6ff0ce217cbf3e999423
-  data.tar.gz: 0b559e347df791f257144798d12e03d882584af0035606ceba2777b1aa13c6da
+  metadata.gz: 5ebd4ad13239063f0e7108c42cb390feba52c688bf8ad4819f9a219d18d101a2
+  data.tar.gz: f6435a0f03792a85e2644690dac99ab7c0300288862febd5e2b35cb5f9bcf1fe
 SHA512:
-  metadata.gz: 72680038d1f62c296972e56cd788fd01ddc17aec56590eda76b32d3d541543c3acd74e12b1a1ee716df7cbc4d7e148ef5afb34943824e68e55fc1115247621a7
-  data.tar.gz: 0f4270bb398c42726fdec1494e6da82e08ccd73e51e384267cf109ba597ed9e36981922ac013cce7aad90b704222c11576cb07214f401161d4f5432fbdeee5a6
+  metadata.gz: 3f36a02374d2f9c65359fc3354700d2c219bdc0c31cdb9566057e12205433f49abc380f7b67b394974bfc46e519516d3efd9eb0a249847b4a2a7902fcfda55fe
+  data.tar.gz: 01698ff04fb0f5285b8a95fec88c3c1a132da383d3de4f13e450b841e21a2d255a24a6ec0490cb90eb95d66071bfe7faf6373a2b15ebca0d35e1bc3d13161e1c

data/Gemfile.base

@@ -0,0 +1,12 @@
+source 'https://rubygems.org'
+
+gemspec
+
+group :development, :test do
+  gem 'bundler', '>= 1.13'
+  gem 'database_cleaner', '~> 1.6'
+  gem 'pg', '~> 0.18'
+  gem 'pry', '> 0'
+  gem 'rake', '>= 10.0'
+  gem 'rspec', '>= 3.0', '< 4'
+end

data/Gemfile.rails-5-0

@@ -0,0 +1,5 @@
+group :development, :test do
+  gem 'rails', '>= 5.0', '< 5.1'
+end
+
+eval_gemfile "#{__dir__}/Gemfile.base"

data/Gemfile.rails-5-1

@@ -0,0 +1,5 @@
+group :development, :test do
+  gem 'rails', '>= 5.1', '< 5.2'
+end
+
+eval_gemfile "#{__dir__}/Gemfile.base"

data/Gemfile.rails-5-2

@@ -0,0 +1,5 @@
+group :development, :test do
+  gem 'rails', '>= 5.2.0.rc1', '< 6.0'
+end
+
+eval_gemfile "#{__dir__}/Gemfile.base"

data/Gemfile.rails-master

@@ -0,0 +1,5 @@
+group :development, :test do
+  gem 'rails', github: 'rails/rails'
+end
+
+eval_gemfile "./Gemfile.base"

data/README.md

@@ -140,6 +140,14 @@ r.upsert
 # => #<Vehicle id: 1, make: 'Ford', name: 'Focus', doors: 2>
 ```
 
+Partial indexes can be supported with the addition of a `where` clause.
+
+```ruby
+class Account < ApplicationRecord
+  upsert_keys :name, where: 'active is TRUE'
+end
+```
+
 ## Tests
 
 Make sure to have an upsert_test database:
@@ -166,3 +174,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos
 - Andrii Dmytrenko ([@Antti](https://github.com/Antti))
 - Alexia McDonald ([@alexiamcdonald](https://github.com/alexiamcdonald))
 - Timo Schilling ([@timoschilling](https://github.com/timoschilling))
+- Benedikt Deicke ([@benedikt](https://github.com/benedikt))
+- Daniel Cooper ([@danielcooper](https://github.com/danielcooper))

data/Rakefile

@@ -13,7 +13,7 @@ task :setup_and_run_spec do |rake_task|
 
   require File.expand_path('../spec/dummy/config/environment.rb', __FILE__)
 
-  if Rails.version >= '5.2.0.rc1'
+  if Rails.version >= '5.2.0'
     ActiveRecord::Base.connection.migrations_paths << 'spec/dummy/db/migrate'
   end
 

data/lib/active_record_upsert/active_record/persistence.rb

@@ -31,19 +31,19 @@ module ActiveRecordUpsert
       end
 
       def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
-        existing_attributes = arel_attributes_with_values_for_create(self.attributes.keys)
+        existing_attributes = attributes_with_values_for_create(self.attributes.keys)
         values = self.class._upsert_record(existing_attributes, upsert_attribute_names, [arel_condition].compact)
         @new_record = false
         values
       end
 
       module ClassMethods
-        def upsert!(attributes, arel_condition: nil, &block)
+        def upsert!(attributes, arel_condition: nil, validate: true, &block)
           if attributes.is_a?(Array)
             attributes.collect { |hash| upsert(hash, &block) }
           else
             new(attributes, &block).upsert!(
-              attributes: attributes.keys, arel_condition: arel_condition, validate: true
+              attributes: attributes.keys, arel_condition: arel_condition, validate: validate
             )
           end
         end
@@ -57,10 +57,11 @@ module ActiveRecordUpsert
         def _upsert_record(existing_attributes, upsert_attributes_names, wheres) # :nodoc:
           upsert_keys = self.upsert_keys || [primary_key]
           upsert_attributes_names = upsert_attributes_names - [*upsert_keys, 'created_at']
-          values_for_upsert = existing_attributes.select { |a| upsert_attributes_names.include?(a.name) }
+          values_for_upsert = existing_attributes.select { |(name, _value)| upsert_attributes_names.include?(name) }
 
           insert_manager = arel_table.compile_upsert(
             upsert_keys,
+            upsert_options,
             _substitute_values(values_for_upsert),
             _substitute_values(existing_attributes),
             wheres
@@ -71,14 +72,20 @@ module ActiveRecordUpsert
 
         def upsert_keys(*keys)
           return @_upsert_keys if keys.empty?
+          options = keys.extract_options!
           keys = keys.first if keys.size == 1 # support single string/symbol, multiple string/symbols, and array
           return if keys.nil?
           @_upsert_keys = Array(keys).map(&:to_s)
+          @_upsert_options = options
+        end
+
+        def upsert_options
+          @_upsert_options || {}
         end
 
         def inherited(subclass)
           super
-          subclass.upsert_keys(upsert_keys)
+          subclass.upsert_keys(upsert_keys, upsert_options)
         end
       end
     end

data/lib/active_record_upsert/arel/crud.rb

@@ -11,10 +11,11 @@
 # end
 module Arel
   module Crud
-    def compile_upsert(upsert_keys, upsert_values, insert_values, wheres)
+    def compile_upsert(upsert_keys, upsert_options, upsert_values, insert_values, wheres)
       on_conflict_do_update = OnConflictDoUpdateManager.new
 
       on_conflict_do_update.target = self[upsert_keys.join(',')]
+      on_conflict_do_update.target_condition = upsert_options[:where]
       on_conflict_do_update.wheres = wheres
       on_conflict_do_update.set(upsert_values)
 

data/lib/active_record_upsert/arel/nodes/on_conflict.rb

@@ -1,12 +1,13 @@
 module Arel
   module Nodes
     class OnConflict < Node
-      attr_accessor :target, :action
+      attr_accessor :target, :where, :action
 
       def initialize
         super
         @target = nil
         @action = nil
+        @where = nil
       end
 
       def hash

data/lib/active_record_upsert/arel/on_conflict_do_update_manager.rb

@@ -8,6 +8,10 @@ module Arel
       @ctx = @ast
     end
 
+    def target_condition= where
+      @ast.where = where
+    end
+
     def target= column
       @ast.target = column
     end

data/lib/active_record_upsert/arel/visitors/to_sql.rb

@@ -14,6 +14,7 @@ module ActiveRecordUpsert
         def visit_Arel_Nodes_OnConflict o, collector
           collector << "ON CONFLICT "
           collector << " (#{quote_column_name o.target.name}) ".gsub(',', '","')
+          collector << " WHERE #{o.where}" if o.where
           maybe_visit o.action, collector
         end
 

data/lib/active_record_upsert/compatibility/rails51.rb

@@ -22,6 +22,7 @@ module ActiveRecordUpsert
 
         on_conflict_do_update = ::Arel::OnConflictDoUpdateManager.new
         on_conflict_do_update.target = arel_table[upsert_keys.join(',')]
+        on_conflict_do_update.target_condition = self.klass.upsert_options[:where]
         on_conflict_do_update.wheres = wheres
         on_conflict_do_update.set(vals_for_upsert)
 

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.7.4"
+  VERSION = "0.8.0"
 end

data/lib/active_record_upsert.rb

@@ -11,8 +11,10 @@ end
 require 'active_record_upsert/arel'
 require 'active_record_upsert/active_record'
 
-require 'active_record_upsert/compatibility/rails51.rb' if Rails.version >= '5.1.0' && Rails.version < '5.2.0.rc1'
-require 'active_record_upsert/compatibility/rails50.rb' if Rails.version >= '5.0.0' && Rails.version < '5.1.0'
+version = defined?(Rails) ? Rails.version : ActiveRecord.version.to_s
+
+require 'active_record_upsert/compatibility/rails51.rb' if version >= '5.1.0' && version < '5.2.0'
+require 'active_record_upsert/compatibility/rails50.rb' if version >= '5.0.0' && version < '5.1.0'
 
 module ActiveRecordUpsert
   # Your code goes here...

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.7.4
+  version: 0.8.0
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-02-14 00:00:00.000000000 Z
+date: 2018-04-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -79,6 +79,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
+- Gemfile.base
+- Gemfile.rails-5-0
+- Gemfile.rails-5-1
+- Gemfile.rails-5-2
+- Gemfile.rails-master
 - LICENSE
 - README.md
 - Rakefile
@@ -125,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.5
+rubygems_version: 2.7.6
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord