active_record_upsert 0.9.4 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: de123fd4fdfdb6a7cbebd1aa2d7232ecfdebf014723e4b64c7e0ad3a8c8f61b4
-  data.tar.gz: 27d972189bb6e75c48eb43cc7cb93362991ad237ffe84a25349fe148b648187b
+  metadata.gz: 459493128507f8a6ffd12fca94b8270cc93259601b4136c4686ae11f2acd7433
+  data.tar.gz: b3c8961297902a34a92d1f947980d4e1829d8e563401f54a7094d110df77fc66
 SHA512:
-  metadata.gz: c33829cb05d8c261c850e3dcde28842cd50824369231c58b936c30bf6ddae64fb76c68ec594e4e62f4578eb4940d51d23033056a31bfeea2da4e4ad821e14070
-  data.tar.gz: f8943ad447f87aa33b8ae4facdfda3ae7368c8d3e9b3c7bfc1985ddfd97dd2654670620ed803ed52f38034c6c4bc7a49fdc0d8135be83f16504b2efcdb59ed50
+  metadata.gz: 9007d2d2c1889c6b2742783319b7d0c878cf47d01bee568126984390b8ba73e52384aa84ebff72f1cd0f895a42833a53bf55cfe6339b5a07de0353fe307b1f5c
+  data.tar.gz: 8e643c603a776f476a4a0407a5bfa301b0ef8afa726000a32b79fa95a6b036ab04f8360183cf7d33b694912e2577745efbe17418dc572a9a5b6554a757cad864

data/Gemfile.base

@@ -5,7 +5,7 @@ gemspec
 group :development, :test do
   gem 'bundler', '>= 1.13'
   gem 'database_cleaner', '~> 1.6'
-  gem 'pg', '~> 0.18'
+  gem 'pg', '~> 1.1'
   gem 'pry', '> 0'
   gem 'rake', '>= 10.0'
   gem 'rspec', '>= 3.0', '< 4'

data/{Gemfile.rails-5-0 → Gemfile.rails-6-0}

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

data/{Gemfile.rails-5-1 → Gemfile.rails-6-1}

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

data/Gemfile.rails-7-0

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

data/README.md

@@ -2,12 +2,9 @@
 [![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).
+Real upsert for PostgreSQL 9.5+ and Rails 5.2+ / ActiveRecord 5.2+. Uses [ON CONFLICT DO UPDATE](http://www.postgresql.org/docs/9.5/static/sql-insert.html).
 
 ## Main points
 
@@ -17,11 +14,29 @@ Real upsert for PostgreSQL 9.5+ and Rails 5 / ActiveRecord 5. Uses [ON CONFLICT
 
 ## Prerequisites
 
-- PostgreSQL 9.5+
-- ActiveRecord ~> 5
-- For MRI: pg
+- 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.2
+- Ruby MRI, with the `pg` gem
+- _JRuby is currently not supported_
+
+### 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.
+
+### Supported Rails versions
 
-- For JRuby: No support
+This library is compatible with all major Rails versions covered by the Rails
+["Severe Security Issues" maintenance policy](https://guides.rubyonrails.org/maintenance_policy.html).
+
+### Supported Ruby versions
+
+This library may be compatible with older versions of Ruby, however we only run automated
+tests using the
+[officially supported Ruby versions](https://www.ruby-lang.org/en/downloads/branches/).
+
+Please note that Ruby 3.1 is not currently tested because it is incompatible with Rails
+`7.0.0`, `6.1.4.4`, `6.0.4.4` and `5.2.6` ([issue](https://github.com/rails/rails/issues/43998)).
 
 ## Installation
 
@@ -121,6 +136,37 @@ r = MyRecord.new(id: 1, name: 'bar')
 r.upsert!
 ```
 
+### Gotcha with database defaults
+
+When a table is defined with a database default for a field, this gotcha can occur when trying to explicitly upsert a record _to_ the default value (from a non-default value).
+
+**Example**: a table called `hardwares` has a `prio` column with a default value.
+
+    ┌─────────┬─────────┬───────┬
+    │ Column  │ Type    │Default│
+    ├─────────┼─────────┼───────┼
+    │ id      │ integer │ ...
+    │ prio    │ integer │ 999
+
+And `hardwares` has a record with a non-default value for `prio`. Say, the record with `id` 1 has a `prio` of `998`.
+
+In this situation, upserting like:
+
+```ruby
+hw = { id: 1, prio: 999 }
+Hardware.new(prio: hw[:prio]).upsert
+```
+
+will not mention the `prio` column in the `ON CONFLICT` clause, resulting in no update.
+
+However, upserting like so:
+
+```ruby
+Hardware.upsert(prio: hw[:prio]).id
+```
+
+will indeed update the record in the database back to its default value, `999`.
+
 ### Conflict Clauses
 
 It's possible to specify which columns should be used for the conflict clause. **These must comprise a unique index in Postgres.**
@@ -158,6 +204,24 @@ class Account < ApplicationRecord
 end
 ```
 
+Overriding the models' `upsert_keys` when calling `#upsert` or `.upsert`:
+
+```ruby
+  Account.upsert(attrs, opts: { upsert_keys: [:foo, :bar] })
+  # Or, on an instance:
+  account = Account.new(attrs)
+  account.upsert(opts: { upsert_keys: [:foo, :bar] })
+```
+
+Overriding the models' `upsert_options` (partial index) when calling `#upsert` or `.upsert`:
+
+```ruby
+  Account.upsert(attrs, opts: { upsert_options: { where: 'foo IS NOT NULL' } })
+  # Or, on an instance:
+  account = Account.new(attrs)
+  account.upsert(opts: { upsert_options: { where: 'foo IS NOT NULLL } })
+```
+
 ## Tests
 
 Make sure to have an upsert_test database:
@@ -188,3 +252,7 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos
 - Daniel Cooper ([@danielcooper](https://github.com/danielcooper))
 - Laurent Vallar ([@val](https://github.com/val))
 - Emmanuel Quentin ([@manuquentin](https://github.com/manuquentin))
+- Jeff Wallace ([@tjwallace](https://github.com/tjwallace))
+- Kirill Zaitsev ([@Bugagazavr](https://github.com/Bugagazavr))
+- Nick Campbell ([@nickcampbell18](https://github.com/nickcampbell18))
+- Mikhail Doronin ([@misdoro](https://github.com/misdoro))

data/active_record_upsert.gemspec

@@ -13,15 +13,14 @@ Gem::Specification.new do |spec|
 
   spec.summary       = %q{Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord}
 
-  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(bin|test|spec|features)/}) } -
-                       %w[.gitignore .rspec .travis.yml Dockerfile Gemfile Gemfile.docker docker-compose.yml]
+  spec.files         = `git ls-files -z`.split("\x0").reject { |f| f.match(%r{^(.github|bin|test|spec|features)/}) } -
+                       %w[.gitignore .rspec Dockerfile Gemfile Gemfile.docker docker-compose.yml]
   spec.bindir        = "exe"
   spec.executables   = spec.files.grep(%r{^exe/}) { |f| File.basename(f) }
   spec.require_paths = ["lib"]
 
   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.2', '< 7.1'
   spec.add_runtime_dependency 'pg', '>= 0.18', '< 2.0'
 end

data/lib/active_record_upsert/active_record/persistence.rb

@@ -1,7 +1,7 @@
 module ActiveRecordUpsert
   module ActiveRecord
     module PersistenceExtensions
-      def upsert!(attributes: nil, arel_condition: nil, validate: true)
+      def upsert!(attributes: nil, arel_condition: nil, validate: true, opts: {})
         raise ::ActiveRecord::ReadOnlyRecord, "#{self.class} is marked as readonly" if readonly?
         raise ::ActiveRecord::RecordSavedError, "Can't upsert a record that has already been saved" if persisted?
         validate == false || perform_validations || raise_validation_error
@@ -11,24 +11,26 @@ module ActiveRecordUpsert
             attributes = attributes +
               timestamp_attributes_for_create_in_model +
               timestamp_attributes_for_update_in_model
-            _upsert_record(attributes.map(&:to_s).uniq, arel_condition)
+            _upsert_record(attributes.map(&:to_s).uniq, arel_condition, opts)
           }
         }
 
         self
       end
 
-      def upsert(*args)
-        upsert!(*args)
+      def upsert(**kwargs)
+        upsert!(**kwargs)
       rescue ::ActiveRecord::RecordInvalid
         false
       end
 
-      def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
-        existing_attributes = attributes_with_values_for_create(self.attributes.keys)
-        values = self.class._upsert_record(existing_attributes, upsert_attribute_names, [arel_condition].compact)
+      def _upsert_record(upsert_attribute_names = changed, arel_condition = nil, opts = {})
+        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, opts)
         @attributes = self.class.attributes_builder.build_from_database(values.first.to_h)
         @new_record = false
+        changes_applied
         values
       end
 
@@ -39,24 +41,25 @@ module ActiveRecordUpsert
       end
 
       module ClassMethods
-        def upsert!(attributes, arel_condition: nil, validate: true, &block)
+        def upsert!(attributes, arel_condition: nil, validate: true, opts: {}, &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: validate
+              attributes: attributes.keys, arel_condition: arel_condition, validate: validate, opts: opts
             )
           end
         end
 
-        def upsert(*args)
-          upsert!(*args)
+        def upsert(attributes, **kwargs, &block)
+          upsert!(attributes, **kwargs, &block)
         rescue ::ActiveRecord::RecordInvalid
           false
         end
 
-        def _upsert_record(existing_attributes, upsert_attributes_names, wheres) # :nodoc:
-          upsert_keys = self.upsert_keys || [primary_key]
+        def _upsert_record(existing_attributes, upsert_attributes_names, wheres, opts) # :nodoc:
+          upsert_keys = opts[:upsert_keys] || self.upsert_keys || [primary_key]
+          upsert_options = opts[:upsert_options] || self.upsert_options
           upsert_attributes_names = upsert_attributes_names - [*upsert_keys, 'created_at']
 
           existing_attributes = existing_attributes

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

@@ -1,47 +1,8 @@
-# module ActiveRecordUpsert
-#   module Arel
-#     module Nodes
-#       module InsertStatementExtensions
-#         attr_accessor :on_conflict
-#
-#         def initialize
-#           @on_conflict = nil
-#           super()
-#         end
-#
-#         def hash
-#           [@relation, @columns, @values, @select, @on_conflict].hash
-#         end
-#
-#         def eql? other
-#           self.class == other.class &&
-#             self.relation == other.relation &&
-#             self.columns == other.columns &&
-#             self.select == other.select &&
-#             self.values == other.values &&
-#             self.on_conflict == other.on_conflict
-#         end
-#       end
-#
-#       ::Arel::Nodes::InsertStatement.prepend(InsertStatementExtensions)
-#     end
-#   end
-# end
-
 module Arel
   module Nodes
     class InsertStatement
       attr_accessor :on_conflict
 
-      def initialize
-        super()
-        @relation = nil
-        @columns  = []
-        @values   = nil
-        @select   = nil
-        @on_conflict = nil
-      end
-
       def hash
         [@relation, @columns, @values, @select, @on_conflict].hash
       end

data/lib/active_record_upsert/arel/table_extensions.rb

@@ -0,0 +1,23 @@
+module ActiveRecordUpsert
+  module Arel
+    module TableExtensions
+      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 = ::Arel::OnConflictDoUpdateManager.new
+
+        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)
+
+        insert_manager = ::Arel::InsertManager.new
+        insert_manager.on_conflict = on_conflict_do_update.to_node
+        insert_manager.into insert_values.first.first.relation
+        insert_manager.insert(insert_values)
+        insert_manager
+      end
+    end
+    ::Arel::Table.prepend(TableExtensions)
+  end
+end

data/lib/active_record_upsert/compatibility/rails60.rb

@@ -0,0 +1,18 @@
+module ActiveRecordUpsert
+  module ActiveRecord
+    module TransactionsExtensions
+      def upsert(*args, **kwargs)
+        with_transaction_returning_status { super }
+      end
+    end
+
+    module ConnectAdapterExtension
+      def upsert(*args, **kwargs)
+        ::ActiveRecord::Base.clear_query_caches_for_current_thread
+        super
+      end
+
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(self)
+    end
+  end
+end

data/lib/active_record_upsert/compatibility/rails70.rb

@@ -0,0 +1,59 @@
+module ActiveRecordUpsert
+  module ActiveRecord
+    module PersistenceExtensions
+      module ClassMethods
+        def __substitute_values(values, table)
+          values.map do |name, value|
+            attr = table[name]
+            unless ::Arel.arel_node?(value) || value.is_a?(::ActiveModel::Attribute)
+              type = type_for_attribute(attr.name)
+              value = predicate_builder.build_bind_attribute(attr.name, type.cast(value))
+            end
+            [attr, value]
+          end
+        end
+
+        def _upsert_record(existing_attributes, upsert_attributes_names, wheres, opts) # :nodoc:
+          upsert_keys = opts[:upsert_keys] || self.upsert_keys || [primary_key]
+          upsert_options = opts[:upsert_options] || self.upsert_options
+          upsert_attributes_names = upsert_attributes_names - [*upsert_keys, 'created_at']
+
+          existing_attributes = existing_attributes
+            .transform_keys { |name| _prepare_column(name) }
+            .reject { |key, _| key.nil? }
+
+          upsert_attributes_names = upsert_attributes_names
+            .map { |name| _prepare_column(name) }
+            .compact
+
+          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, arel_table),
+            __substitute_values(existing_attributes, arel_table),
+            wheres
+          )
+
+          connection.upsert(insert_manager, "#{self} Upsert")
+        end
+      end
+    end
+
+    module TransactionsExtensions
+      def upsert(*args, **kwargs)
+        with_transaction_returning_status { super }
+      end
+    end
+
+    module ConnectAdapterExtension
+      def upsert(*args, **kwargs)
+        ::ActiveRecord::Base.clear_query_caches_for_current_thread
+        super
+      end
+
+      ::ActiveRecord::ConnectionAdapters::PostgreSQLAdapter.prepend(self)
+    end
+  end
+end

data/lib/active_record_upsert/version.rb

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

data/lib/active_record_upsert.rb

@@ -13,8 +13,8 @@ require 'active_record_upsert/active_record'
 
 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'
+require 'active_record_upsert/compatibility/rails70.rb' if version >= '7.0.0' && version < '7.2.0'
+require 'active_record_upsert/compatibility/rails60.rb' if version >= '6.0.0' && version < '6.2.0'
 
 module ActiveRecordUpsert
   # Your code goes here...

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: active_record_upsert
 version: !ruby/object:Gem::Version
-  version: 0.9.4
+  version: 0.11.0
 platform: ruby
 authors:
 - Jesper Josefsson
 - Olle Jonsson
-autorequire: 
+autorequire:
 bindir: exe
 cert_chain: []
-date: 2018-09-19 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,40 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.0'
+        version: '7.1'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !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: '7.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -71,7 +51,7 @@ dependencies:
     - - "<"
       - !ruby/object:Gem::Version
         version: '2.0'
-description: 
+description:
 email:
 - jesper.josefsson@gmail.com
 - olle.jonsson@gmail.com
@@ -80,9 +60,10 @@ extensions: []
 extra_rdoc_files: []
 files:
 - Gemfile.base
-- Gemfile.rails-5-0
-- Gemfile.rails-5-1
 - Gemfile.rails-5-2
+- Gemfile.rails-6-0
+- Gemfile.rails-6-1
+- Gemfile.rails-7-0
 - Gemfile.rails-master
 - LICENSE
 - README.md
@@ -96,7 +77,6 @@ files:
 - lib/active_record_upsert/active_record/timestamp.rb
 - lib/active_record_upsert/active_record/transactions.rb
 - lib/active_record_upsert/arel.rb
-- lib/active_record_upsert/arel/crud.rb
 - lib/active_record_upsert/arel/insert_manager.rb
 - lib/active_record_upsert/arel/nodes.rb
 - lib/active_record_upsert/arel/nodes/do_nothing.rb
@@ -106,15 +86,16 @@ files:
 - lib/active_record_upsert/arel/nodes/on_conflict.rb
 - lib/active_record_upsert/arel/nodes/on_conflict_action.rb
 - lib/active_record_upsert/arel/on_conflict_do_update_manager.rb
+- lib/active_record_upsert/arel/table_extensions.rb
 - 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/compatibility/rails70.rb
 - lib/active_record_upsert/version.rb
 homepage: https://github.com/jesjos/active_record_upsert/
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -129,9 +110,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubyforge_project: 
-rubygems_version: 2.7.7
-signing_key: 
+rubygems_version: 3.2.7
+signing_key:
 specification_version: 4
 summary: Real PostgreSQL 9.5+ upserts using ON CONFLICT for ActiveRecord
 test_files: []

data/lib/active_record_upsert/arel/crud.rb

@@ -1,31 +0,0 @@
-# module ActiveRecordUpsert
-#   module Arel
-#     module CrudExtensions
-#       def create_on_conflict_do_update
-#         OnConflictDoUpdateManager.new
-#       end
-#     end
-#
-#     ::Arel::Crud.prepend(CrudExtensions)
-#   end
-# end
-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 = target
-      on_conflict_do_update.target_condition = upsert_options[:where]
-      on_conflict_do_update.wheres = wheres
-      on_conflict_do_update.set(upsert_values)
-
-      insert_manager = create_insert
-      insert_manager.on_conflict = on_conflict_do_update.to_node
-      insert_manager.into insert_values.first.first.relation
-      insert_manager.insert(insert_values)
-      insert_manager
-    end
-  end
-end

data/lib/active_record_upsert/compatibility/rails50.rb

@@ -1 +0,0 @@
-require_relative 'rails51'

data/lib/active_record_upsert/compatibility/rails51.rb

@@ -1,63 +0,0 @@
-module ActiveRecordUpsert
-  module ActiveRecord
-    module PersistenceExtensions
-      def _upsert_record(upsert_attribute_names = changed, arel_condition = nil)
-        upsert_attribute_names = upsert_attribute_names.map { |name| _prepare_column(name) } & self.class.column_names
-        existing_attributes = arel_attributes_with_values_for_create(self.class.column_names)
-        values = self.class.unscoped.upsert(existing_attributes, upsert_attribute_names, [arel_condition].compact)
-        @new_record = false
-        @attributes = self.class.attributes_builder.build_from_database(values.first.to_h)
-        values
-      end
-
-      def _prepare_column(name)
-        if self.class.reflections.key?(name)
-          self.class.reflections[name].foreign_key
-        else
-          name
-        end
-      end
-    end
-
-    module RelationExtensions
-      def upsert(existing_attributes, upsert_attributes, wheres) # :nodoc:
-        substitutes, binds = substitute_values(existing_attributes)
-        upsert_keys = self.klass.upsert_keys || [primary_key]
-
-        upsert_attributes = upsert_attributes - [*upsert_keys, 'created_at']
-        upsert_keys_filter = ->(o) { upsert_attributes.include?(o.name) }
-
-        on_conflict_binds = binds.select(&upsert_keys_filter)
-        vals_for_upsert = substitutes.select { |s| upsert_keys_filter.call(s.first) }
-
-        target = arel_table[upsert_options.key?(:literal) ? ::Arel::Nodes::SqlLiteral.new(upsert_options[:literal]) : upsert_keys.join(',')]
-
-        on_conflict_do_update = ::Arel::OnConflictDoUpdateManager.new
-        on_conflict_do_update.target = target
-        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)
-
-        insert_manager = arel_table.create_insert
-        insert_manager.into arel_table
-        insert_manager.on_conflict = on_conflict_do_update.to_node
-        insert_manager.insert substitutes
-
-        @klass.connection.upsert(insert_manager, "#{self} Upsert", binds + on_conflict_binds)
-      end
-
-      ::ActiveRecord::Relation.include(self)
-    end
-
-    module ConnectionAdapters
-      module Postgresql
-        module DatabaseStatementsExtensions
-          def upsert(arel, name = nil, binds = [])
-            sql = to_sql(arel, binds)
-            exec_upsert(sql, name, binds)
-          end
-        end
-      end
-    end
-  end
-end