active_record_upsert 0.9.4 → 0.9.5

checksums.yaml

@@ -1,7 +1,7 @@
 ---
-SHA256:
-  metadata.gz: de123fd4fdfdb6a7cbebd1aa2d7232ecfdebf014723e4b64c7e0ad3a8c8f61b4
-  data.tar.gz: 27d972189bb6e75c48eb43cc7cb93362991ad237ffe84a25349fe148b648187b
+SHA1:
+  metadata.gz: 70b72c5ef238f1ffe3f7cfd5e2cc53f3b4c9e31f
+  data.tar.gz: '09bfa1ad9bf6e4ea635371382d1b8e02f5fe8fb0'
 SHA512:
-  metadata.gz: c33829cb05d8c261c850e3dcde28842cd50824369231c58b936c30bf6ddae64fb76c68ec594e4e62f4578eb4940d51d23033056a31bfeea2da4e4ad821e14070
-  data.tar.gz: f8943ad447f87aa33b8ae4facdfda3ae7368c8d3e9b3c7bfc1985ddfd97dd2654670620ed803ed52f38034c6c4bc7a49fdc0d8135be83f16504b2efcdb59ed50
+  metadata.gz: 2e75ee846435aeb19b077eb34d844345d86d04374b9bdfb09d5311b3fea00c029dc8acd590b61541186d38efa907166df01faaeffcf9bae022e6116ef3baa405
+  data.tar.gz: 2b2b56642038a8c350bfd6d7cc8a6d5bd1349e353b69b206509ffe68b1e716b95e23e2c71a4c5f2ccdda13b541f1152d69167da1bd6ba07f9fd054daee936430

data/Gemfile.rails-6-0

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

data/README.md

@@ -2,9 +2,6 @@
 [![Build Status](https://travis-ci.org/jesjos/active_record_upsert.svg?branch=master)](https://travis-ci.org/jesjos/active_record_upsert)
 [![Code Climate](https://codeclimate.com/github/jesjos/active_record_upsert/badges/gpa.svg)](https://codeclimate.com/github/jesjos/active_record_upsert)
 
-# NB: INCOMPATIBILITY
-B/c of a broken build matrix, versions 0.9.2 - 0.9.3 are incompatible with rails < 5.2.1!
-
 # ActiveRecordUpsert
 
 Real upsert for PostgreSQL 9.5+ and Rails 5 / ActiveRecord 5. Uses [ON CONFLICT DO UPDATE](http://www.postgresql.org/docs/9.5/static/sql-insert.html).
@@ -17,12 +14,17 @@ Real upsert for PostgreSQL 9.5+ and Rails 5 / ActiveRecord 5. Uses [ON CONFLICT
 
 ## Prerequisites
 
-- PostgreSQL 9.5+
+- PostgreSQL 9.5+ (that's when UPSERT support was added; see Wikipedia's [PostgreSQL Release History](https://en.wikipedia.org/wiki/PostgreSQL#Release_history))
 - ActiveRecord ~> 5
 - For MRI: pg
 
 - For JRuby: No support
 
+### NB: Releases to avoid
+
+Due to a broken build matrix, v0.9.2 and v0.9.3 are incompatible with Rails
+< 5.2.1. [v0.9.4](https://github.com/jesjos/active_record_upsert/releases/tag/v0.9.4) fixed this issue.
+
 ## Installation
 
 Add this line to your application's Gemfile:

data/active_record_upsert.gemspec

@@ -21,7 +21,6 @@ Gem::Specification.new do |spec|
 
   spec.platform = Gem::Platform::RUBY
 
-  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.0'
-  spec.add_runtime_dependency 'arel', '> 7.0', '< 10.0'
+  spec.add_runtime_dependency 'activerecord', '>= 5.0', '< 6.1'
   spec.add_runtime_dependency 'pg', '>= 0.18', '< 2.0'
 end

data/lib/active_record_upsert.rb

@@ -13,6 +13,7 @@ require 'active_record_upsert/active_record'
 
 version = defined?(Rails) ? Rails.version : ActiveRecord.version.to_s
 
+require 'active_record_upsert/compatibility/rails60.rb' if version >= '6.0.0' && version < '6.1.0'
 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'
 

data/lib/active_record_upsert/active_record/persistence.rb

@@ -25,7 +25,8 @@ module ActiveRecordUpsert
       end
 
       def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
-        existing_attributes = attributes_with_values_for_create(self.attributes.keys)
+        existing_attribute_names = attributes_for_create(attributes.keys)
+        existing_attributes = attributes_with_values(existing_attribute_names)
         values = self.class._upsert_record(existing_attributes, upsert_attribute_names, [arel_condition].compact)
         @attributes = self.class.attributes_builder.build_from_database(values.first.to_h)
         @new_record = false

data/lib/active_record_upsert/compatibility/rails60.rb

@@ -0,0 +1,9 @@
+module ActiveRecordUpsert
+  module ActiveRecord
+    module TransactionsExtensions
+      def upsert(*args)
+        with_transaction_returning_status { super }
+      end
+    end
+  end
+end

data/lib/active_record_upsert/version.rb

@@ -1,3 +1,3 @@
 module ActiveRecordUpsert
-  VERSION = "0.9.4"
+  VERSION = "0.9.5"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.9.5
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2019-04-26 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -20,7 +20,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '6.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
@@ -30,27 +30,7 @@ dependencies:
         version: '5.0'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
-- !ruby/object:Gem::Dependency
-  name: arel
-  requirement: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '10.0'
-  type: :runtime
-  prerelease: false
-  version_requirements: !ruby/object:Gem::Requirement
-    requirements:
-    - - ">"
-      - !ruby/object:Gem::Version
-        version: '7.0'
-    - - "<"
-      - !ruby/object:Gem::Version
-        version: '10.0'
+        version: '6.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -83,6 +63,7 @@ files:
 - Gemfile.rails-5-0
 - Gemfile.rails-5-1
 - Gemfile.rails-5-2
+- Gemfile.rails-6-0
 - Gemfile.rails-master
 - LICENSE
 - README.md
@@ -109,6 +90,7 @@ files:
 - lib/active_record_upsert/arel/visitors/to_sql.rb
 - lib/active_record_upsert/compatibility/rails50.rb
 - lib/active_record_upsert/compatibility/rails51.rb
+- lib/active_record_upsert/compatibility/rails60.rb
 - lib/active_record_upsert/version.rb
 homepage: https://github.com/jesjos/active_record_upsert/
 licenses:
@@ -130,7 +112,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 2.7.7
+rubygems_version: 2.6.14.4
 signing_key: 
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord