activerecord-slotted_counters 0.2.0 → 0.3.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 76c73b0a3e75e1fbddb355beedf5aa5967f43ffb5043d0051572423ef3a2188c
-  data.tar.gz: be40038645de42ee29e31c02cdafac846641d079404c65ac12a44726d22dc8fa
+  metadata.gz: 2a233ed9bbeebe36d70a84c813b01d07cf74057709b907d491ac71e688bfc44c
+  data.tar.gz: c93306db04ae60233c9fb0ec6b8a28f1ee75f5bf22e34f503ae462f6858baa07
 SHA512:
-  metadata.gz: e5f7a7077bb02f35124a72417a2d60d2ea8da356a32e12020549fbacdb08d7ea76f2ff913e4fdd79376ab334cfec15221e808e62a76bc2652e779c31a9462ef7
-  data.tar.gz: a8f3881d903bbb5f032bc8763733d5f3abd770c44a9796cfbec79db171fcb1f0a453d4fe0124907315c662161d3c33a523fd20557fc2419a6c3b3c270323e71b
+  metadata.gz: ce0bb7f7cdb8fe0c48de169c2e8e94d5977e74cb3840bc4aafbaf181a866e12eb7b06d4ffef603d0768d21ec4b16f7092f2884dd0c1bf1b76d99cd61e71c9353
+  data.tar.gz: 93d093f88f9cae152096dbc7c3e906f4a9c39a2e50db21befeef4b9ab756515bea3149ffa6fdf7391aa2dc16d2e816f9a0819567d25992f517936b872391c135

data/CHANGELOG.md

@@ -2,6 +2,10 @@
 
 ## master
 
+## 0.3.0 (2025-03-05)
+
+- Rails 8 support. ([@palkan][])
+
 ## 0.2.0 (2023-10-27)
 
 - Add Mysql support [#18](https://github.com/evilmartians/activerecord-slotted_counters/pull/18) ([@prog-supdex][])

data/lib/activerecord_slotted_counters/adapters/mysql_upsert.rb

@@ -5,7 +5,7 @@ module ActiveRecordSlottedCounters
     class MysqlUpsert
       attr_reader :klass
 
-      def initialize(klass)
+      def initialize(klass, **)
         @klass = klass
       end
 

data/lib/activerecord_slotted_counters/adapters/pg_upsert.rb

@@ -5,7 +5,7 @@ module ActiveRecordSlottedCounters
     class PgUpsert
       attr_reader :klass
 
-      def initialize(klass)
+      def initialize(klass, **)
         @klass = klass
       end
 

data/lib/activerecord_slotted_counters/adapters/rails7_upsert.rb

@@ -0,0 +1,22 @@
+# frozen_string_literal: true
+
+module ActiveRecordSlottedCounters
+  module Adapters
+    class Rails7Upsert < RailsUpsert
+      def apply?(_)
+        ActiveRecord::VERSION::MAJOR == 7 && ActiveRecord::VERSION::MINOR < 2
+      end
+
+      def bulk_insert(attributes, on_duplicate: nil, unique_by: nil)
+        opts = {on_duplicate: on_duplicate, unique_by: unique_by}
+        opts.delete(:unique_by) unless supports_insert_conflict_target
+
+        # We have to manually call #update here to return the number of affected rows.
+        # In Rails <7.2, connection is obtained internally.
+        ActiveRecord::InsertAll.new(klass, attributes, **opts).then do |inserter|
+          inserter.send(:connection).update(inserter.send(:to_sql))
+        end
+      end
+    end
+  end
+end

data/lib/activerecord_slotted_counters/adapters/rails_upsert.rb

@@ -3,10 +3,11 @@
 module ActiveRecordSlottedCounters
   module Adapters
     class RailsUpsert
-      attr_reader :klass
+      attr_reader :klass, :supports_insert_conflict_target
 
-      def initialize(klass)
+      def initialize(klass, supports_insert_conflict_target: false)
         @klass = klass
+        @supports_insert_conflict_target = supports_insert_conflict_target
       end
 
       def apply?(_)
@@ -14,11 +15,22 @@ module ActiveRecordSlottedCounters
       end
 
       def bulk_insert(attributes, on_duplicate: nil, unique_by: nil)
-        klass.upsert_all(attributes, on_duplicate: on_duplicate, unique_by: unique_by).rows.count
+        opts = {on_duplicate: on_duplicate, unique_by: unique_by}
+        opts.delete(:unique_by) unless supports_insert_conflict_target
+
+        klass.with_connection do |c|
+          # We have to manually call #update here to return the number of affected rows
+          c.update(ActiveRecord::InsertAll.new(klass.all, c, attributes, **opts).send(:to_sql))
+        end
       end
 
       def wrap_column_name(value)
-        "EXCLUDED.#{value}"
+        # This is mysql
+        if !supports_insert_conflict_target
+          "VALUES(#{value})"
+        else
+          "EXCLUDED.#{value}"
+        end
       end
     end
   end

data/lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb

@@ -5,7 +5,7 @@ module ActiveRecordSlottedCounters
     class SqliteUpsert
       attr_reader :klass
 
-      def initialize(klass)
+      def initialize(klass, **)
         @klass = klass
       end
 

data/lib/activerecord_slotted_counters/has_slotted_counter.rb

@@ -4,6 +4,7 @@ require "active_support"
 require "activerecord_slotted_counters/utils"
 
 require "activerecord_slotted_counters/adapters/rails_upsert"
+require "activerecord_slotted_counters/adapters/rails7_upsert"
 require "activerecord_slotted_counters/adapters/pg_upsert"
 require "activerecord_slotted_counters/adapters/sqlite_upsert"
 require "activerecord_slotted_counters/adapters/mysql_upsert"
@@ -44,16 +45,17 @@ module ActiveRecordSlottedCounters
 
       def set_slotted_counter_db_adapter
         available_adapters = [
+          ActiveRecordSlottedCounters::Adapters::Rails7Upsert,
+          ActiveRecordSlottedCounters::Adapters::RailsUpsert,
           ActiveRecordSlottedCounters::Adapters::MysqlUpsert,
           ActiveRecordSlottedCounters::Adapters::SqliteUpsert,
-          ActiveRecordSlottedCounters::Adapters::PgUpsert,
-          ActiveRecordSlottedCounters::Adapters::RailsUpsert
+          ActiveRecordSlottedCounters::Adapters::PgUpsert
         ]
 
         current_adapter_name = connection.adapter_name
 
         adapter = available_adapters
-          .map { |adapter| adapter.new(self) }
+          .map { |adapter| adapter.new(self, supports_insert_conflict_target: connection.supports_insert_conflict_target?) }
           .detect { |adapter| adapter.apply?(current_adapter_name) }
 
         raise NotSupportedAdapter.new(current_adapter_name) if adapter.nil?
@@ -224,7 +226,7 @@ module ActiveRecordSlottedCounters
       end
 
       def touch_attributes(ids, touch)
-        scope = where(id: ids)
+        scope = unscoped.where(id: ids)
         return scope.touch_all if touch == true
 
         scope.touch_all(touch)

data/lib/activerecord_slotted_counters/utils.rb

@@ -7,11 +7,11 @@ module ActiveRecordSlottedCounters
     private
 
     def slotted_counter_association_name(counter_type)
-      "#{counter_type}_slotted_counters".to_sym
+      :"#{counter_type}_slotted_counters"
     end
 
     def slotted_counter_name(counter_type)
-      "#{counter_type}_count".to_sym
+      :"#{counter_type}_count"
     end
 
     # TODO refactoring

data/lib/activerecord_slotted_counters/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module ActiveRecordSlottedCounters # :nodoc:
-  VERSION = "0.2.0"
+  VERSION = "0.3.0"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-slotted_counters
 version: !ruby/object:Gem::Version
-  version: 0.2.0
+  version: 0.3.0
 platform: ruby
 authors:
 - Egor Lukin
@@ -9,7 +9,7 @@ authors:
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2023-10-27 00:00:00.000000000 Z
+date: 2025-03-06 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activerecord
@@ -94,6 +94,7 @@ files:
 - lib/activerecord-slotted_counters.rb
 - lib/activerecord_slotted_counters/adapters/mysql_upsert.rb
 - lib/activerecord_slotted_counters/adapters/pg_upsert.rb
+- lib/activerecord_slotted_counters/adapters/rails7_upsert.rb
 - lib/activerecord_slotted_counters/adapters/rails_upsert.rb
 - lib/activerecord_slotted_counters/adapters/sqlite_upsert.rb
 - lib/activerecord_slotted_counters/has_slotted_counter.rb
@@ -126,7 +127,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.4.20
+rubygems_version: 3.4.19
 signing_key:
 specification_version: 4
 summary: Active Record slotted counters support