active_record_upsert 0.8.0 → 0.9.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5ebd4ad13239063f0e7108c42cb390feba52c688bf8ad4819f9a219d18d101a2
-  data.tar.gz: f6435a0f03792a85e2644690dac99ab7c0300288862febd5e2b35cb5f9bcf1fe
+  metadata.gz: b01678cb29f0661418c62699e1278e500a9704d174f114a63118823798361721
+  data.tar.gz: d850a9160cc1b7fe9c6fa2c57843cd983734747689cb2b956d2a357714c1944d
 SHA512:
-  metadata.gz: 3f36a02374d2f9c65359fc3354700d2c219bdc0c31cdb9566057e12205433f49abc380f7b67b394974bfc46e519516d3efd9eb0a249847b4a2a7902fcfda55fe
-  data.tar.gz: 01698ff04fb0f5285b8a95fec88c3c1a132da383d3de4f13e450b841e21a2d255a24a6ec0490cb90eb95d66071bfe7faf6373a2b15ebca0d35e1bc3d13161e1c
+  metadata.gz: 66ea79bd414e4d03f0a2ef54d309fb65092a2e40170ee399d28df47fd5fbbe3a0c657a4c16d7615d03dd5d235444c72f8478542249ea66279a36f57076d2b8d4
+  data.tar.gz: c35cc444d6abac21f43e49d0c588b65347b45d6692d0f2528846f02d05a28cd2241486f9496312ccaa2621966afc5a2b4babb84c305463f02d223644a9336fcb

data/README.md

@@ -148,6 +148,14 @@ class Account < ApplicationRecord
 end
 ```
 
+Custom index can be handled with a Hash containing a literal key :
+
+```ruby
+class Account < ApplicationRecord
+  upsert_keys literal: 'md5(my_long_field)'
+end
+```
+
 ## Tests
 
 Make sure to have an upsert_test database:
@@ -176,3 +184,5 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos
 - Timo Schilling ([@timoschilling](https://github.com/timoschilling))
 - Benedikt Deicke ([@benedikt](https://github.com/benedikt))
 - Daniel Cooper ([@danielcooper](https://github.com/danielcooper))
+- Laurent Vallar ([@val](https://github.com/val))
+- Emmanuel Quentin ([@manuquentin](https://github.com/manuquentin))

data/lib/active_record_upsert/active_record/persistence.rb

@@ -75,7 +75,7 @@ module ActiveRecordUpsert
           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_keys = Array(keys)
           @_upsert_options = options
         end
 

data/lib/active_record_upsert/arel/crud.rb

@@ -12,9 +12,11 @@
 module Arel
   module Crud
     def compile_upsert(upsert_keys, upsert_options, upsert_values, insert_values, wheres)
+      # Support non-attribute key (like `md5(my_attribute)``)
+      target = self[upsert_options.key?(:literal) ? ::Arel::Nodes::SqlLiteral.new(upsert_options[:literal]) : upsert_keys.join(',')]
       on_conflict_do_update = OnConflictDoUpdateManager.new
 
-      on_conflict_do_update.target = self[upsert_keys.join(',')]
+      on_conflict_do_update.target = target
       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/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.8.0
+  version: 0.9.1
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-04-24 00:00:00.000000000 Z
+date: 2018-05-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -130,7 +130,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.6
+rubygems_version: 2.7.7
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord