active_record_upsert 0.10.1 → 0.11.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e985d64fa74dedda4c75a2d8fb61f91e7ca89eca2d4c6e6c1bc62f9bf8c0499c
-  data.tar.gz: 3acce358c953805747e39c96d1028ed92715c38ac90a07f744eb8e12f76c278a
+  metadata.gz: 459493128507f8a6ffd12fca94b8270cc93259601b4136c4686ae11f2acd7433
+  data.tar.gz: b3c8961297902a34a92d1f947980d4e1829d8e563401f54a7094d110df77fc66
 SHA512:
-  metadata.gz: aea0bae90f0a51b27a1b3b8e24ad7bdf59c26a80433f4997892f7f5b1d1ea616f1b70731e56f052b7c9d7241b397f0613a6e2e8d0854021ba97c5ea623ab37af
-  data.tar.gz: 0c9ca9e4d570cbb4741cdd34feb71bc4b236a09c263dfc4c65a0d6092a63ec1c2a776a49cb4e64386f03e7d46502b6140ab3792b5b755c2a1e809a94cc866114
+  metadata.gz: 9007d2d2c1889c6b2742783319b7d0c878cf47d01bee568126984390b8ba73e52384aa84ebff72f1cd0f895a42833a53bf55cfe6339b5a07de0353fe307b1f5c
+  data.tar.gz: 8e643c603a776f476a4a0407a5bfa301b0ef8afa726000a32b79fa95a6b036ab04f8360183cf7d33b694912e2577745efbe17418dc572a9a5b6554a757cad864

data/Gemfile.rails-6-0

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

data/Gemfile.rails-6-1

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

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

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

data/README.md

@@ -4,7 +4,7 @@
 
 # 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
 
@@ -15,16 +15,29 @@ Real upsert for PostgreSQL 9.5+ and Rails 5+ / ActiveRecord 5+. Uses [ON CONFLIC
 ## Prerequisites
 
 - 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
+- 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
+
+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
 
 Add this line to your application's Gemfile:
@@ -135,7 +148,7 @@ When a table is defined with a database default for a field, this gotcha can occ
     │ 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`. 
+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:
 
@@ -242,3 +255,4 @@ Bug reports and pull requests are welcome on GitHub at https://github.com/jesjos
 - 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,14 +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.2'
+  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

@@ -18,8 +18,8 @@ module ActiveRecordUpsert
         self
       end
 
-      def upsert(*args)
-        upsert!(*args)
+      def upsert(**kwargs)
+        upsert!(**kwargs)
       rescue ::ActiveRecord::RecordInvalid
         false
       end
@@ -51,8 +51,8 @@ module ActiveRecordUpsert
           end
         end
 
-        def upsert(*args)
-          upsert!(*args)
+        def upsert(attributes, **kwargs, &block)
+          upsert!(attributes, **kwargs, &block)
         rescue ::ActiveRecord::RecordInvalid
           false
         end

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

@@ -1,13 +1,13 @@
 module ActiveRecordUpsert
   module ActiveRecord
     module TransactionsExtensions
-      def upsert(*args)
+      def upsert(*args, **kwargs)
         with_transaction_returning_status { super }
       end
     end
 
     module ConnectAdapterExtension
-      def upsert(*args)
+      def upsert(*args, **kwargs)
         ::ActiveRecord::Base.clear_query_caches_for_current_thread
         super
       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.10.1"
+  VERSION = "0.11.0"
 end

data/lib/active_record_upsert.rb

@@ -13,9 +13,8 @@ require 'active_record_upsert/active_record'
 
 version = defined?(Rails) ? Rails.version : ActiveRecord.version.to_s
 
+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'
-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.10.1
+  version: 0.11.0
 platform: ruby
 authors:
 - Jesper Josefsson
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2021-04-21 00:00:00.000000000 Z
+date: 2022-01-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -17,20 +17,20 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: '5.0'
+        version: '5.2'
     - - "<"
       - !ruby/object:Gem::Version
-        version: '6.2'
+        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.2'
+        version: '7.1'
 - !ruby/object:Gem::Dependency
   name: pg
   requirement: !ruby/object:Gem::Requirement
@@ -59,13 +59,11 @@ executables: []
 extensions: []
 extra_rdoc_files: []
 files:
-- ".github/workflows/ci.yml"
 - 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
@@ -79,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
@@ -89,10 +86,10 @@ 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:

data/.github/workflows/ci.yml

@@ -1,51 +0,0 @@
-name: CI
-
-on:
-  pull_request:
-    branches: [$default-branches]
-  push:
-    branches: [$default-branch]
-
-jobs:
-  test:
-    name: Test
-    runs-on: ubuntu-latest
-    services:
-      postgres:
-        images: postgres
-        env:
-          POSTGRES_DB: upsert_test
-          POSTGRES_PASSWORD: postgres
-          POSTGRES_USER: postgres
-        options: >-
-          --health-cmd pg_isready
-          --health-interval 10s
-          --health-timeout 5s
-          --health-retries 5
-        ports:
-          - 5432:5432
-
-    strategy:
-      fail-fast: false
-      matrix:
-        ruby-version: [2.5.x, 2.6.x, 2.7.x]
-        gemfile: [Gemfile, Gemfile.rails-master, Gemfile.rails-6-1, Gemfile.rails-5-2, Gemfile.rails-5-1, Gemfile.rails-5-0]
-
-    steps:
-      - uses: actions/checkout@v2
-
-      - name: Prepare database
-        run: |
-          createdb --echo -U $POSTGRES_USER $POSTGRES_DB
-          psql -U $POSTGRES_USER $POSTGRES_DB < spec/dummy/db/structure.sql
-
-      - name: Set up Ruby
-        uses: ruby/setup-ruby@v1
-        with:
-          ruby-version: ${{ matrix.ruby-version }}
-          bundler-cache: true
-        env:
-          BUNDLE_GEMFILE: ${{ matrix.gemfile }}
-
-      - name: Run Tests
-        run: bundle exec rake spec

data/Gemfile.rails-5-1

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

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,65 +0,0 @@
-module ActiveRecordUpsert
-  module ActiveRecord
-    module PersistenceExtensions
-      def _upsert_record(upsert_attribute_names = changed, arel_condition = nil, opts = {})
-        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, opts)
-        @new_record = false
-        @attributes = self.class.attributes_builder.build_from_database(values.first.to_h)
-        changes_applied
-        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, opts) # :nodoc:
-        substitutes, binds = substitute_values(existing_attributes)
-        upsert_keys = opts[:upsert_keys] || self.klass.upsert_keys || [primary_key]
-        upsert_options = opts[:upsert_options] || self.klass.upsert_options
-
-        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 = 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, "#{@klass.name} 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