activerecord-batch_touching 1.0.pre.beta3 → 1.0.pre.beta4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c3c3f592e6fe0beb099dd3d0cec1d0bbc02fe79ef20acc193169bcbf89082aee
-  data.tar.gz: c6f278bb704653d5cc21ff088c80623c53c69abce995694bfe5e37b9bfccb4fe
+  metadata.gz: 8e3ae09116c725e745e467afa1d834b6b2a28bcae4f01d5346e598235bb7d0a8
+  data.tar.gz: 842acced5ccc6df3149f4ae60b2b7f574f1bf04a553a67b54d6832c1501b94ee
 SHA512:
-  metadata.gz: 2fb2776ed67057081efd3103932e6f740d39a6c55f5840b1bcc184aab845e1ce08fbd68e9824bc911ea0c41b1df830d6f9a4f014deadd7c49691f5b72a314ad5
-  data.tar.gz: 34d7055a78683221bfe8883ee0deb9643a973bf005ff2c3c1987abd65e11489c6306079ec17e1ede9384194c6fd709a598c2ad6434d33b982a786f917e51cbfd
+  metadata.gz: 5339c3f783b5b4e8f667a47437fa26e507353d648fd99f637ea73925c28d07d626c7eeb9a8850552ae4182ebb1d36ae9acb5acbe0e2d42e7b0d9f1664a0d86d7
+  data.tar.gz: bf5025309b66d19d7571ef34a3701eb23d9d8c054b68619bb6ad1f881439b37eb99e2a6fdd67e53dbadccf585ea41ae2703ee09fe10d3a81dd9e422675aa8b56

data/lib/activerecord/batch_touching.rb

@@ -55,6 +55,28 @@ module ActiveRecord
     end
 
     class << self
+      # Disable batch touching globally
+      def disable!
+        @disabled = true
+      end
+
+      # Enable batch touching globally
+      def enable!
+        @disabled = false
+      end
+
+      # Disable batch touching for a block
+      def disable
+        Thread.current[:batch_touching_disabled] = false
+        yield
+      ensure
+        Thread.current[:batch_touching_disabled] = false
+      end
+
+      def disabled?
+        Thread.current[:batch_touching_disabled] || @disabled
+      end
+
       def states
         Thread.current[:batch_touching_states] ||= []
       end
@@ -66,7 +88,7 @@ module ActiveRecord
       delegate :add_record, to: :current_state
 
       def batch_touching?
-        states.present?
+        states.present? && !disabled?
       end
 
       # Start batching all touches. When done, apply them. (Unless nested.)
@@ -91,20 +113,15 @@ module ActiveRecord
 
       # Apply the touches that were batched. We're in a transaction already so there's no need to open one.
       def apply_touches
+        current_time = ActiveRecord::Base.current_time_from_proper_timezone
         callbacks_run = Set.new
         all_states = State.new
         while current_state.more_records?
           all_states.merge!(current_state)
           state_records = current_state.records
           current_state.clear_records!
-          state_records.each do |_, records|
-            # Run callbacks to collect more touches (i.e. touch: true for associations)
-            records.each do |record|
-              unless callbacks_run.include?(record)
-                record._run_touch_callbacks
-                callbacks_run.add(record)
-              end
-            end
+          state_records.each do |(_klass, columns), records|
+            soft_touch_records(columns, records, current_time, callbacks_run)
           end
         end
 
@@ -112,30 +129,38 @@ module ActiveRecord
         sorted_records = all_states.records.keys.sort_by { |k| k.first.name }.map { |k| [k, all_states.records[k]] }.to_h
         sorted_records.each do |(klass, columns), records|
           records.reject!(&:destroyed?)
-          touch_records klass, columns, records if records.present?
+          touch_records klass, columns, records, current_time if records.present?
         end
       end
 
-      # Touch the specified records--non-empty set of instances of the same class.
-      def touch_records(klass, columns, records)
-        if columns.present?
-          current_time = records.first.send(:current_time_from_proper_timezone)
-
-          records.each do |record|
-            record.instance_eval do
-              columns.each { |column| write_attribute column, current_time }
+      # Only set new timestamp in memory.
+      # Running callbacks also allows us to collect more touches (i.e. touch: true for associations).
+      def soft_touch_records(columns, records, time, callbacks_run)
+        records.each do |record|
+          record.instance_eval do
+            unless destroyed?
+              columns.each { |column| write_attribute column, time }
               if locking_enabled?
                 self[self.class.locking_column] += 1
                 clear_attribute_change(self.class.locking_column)
               end
               clear_attribute_changes(columns)
             end
+            unless callbacks_run.include?(record)
+              record._run_touch_callbacks
+              callbacks_run.add(record)
+            end
           end
+        end
+      end
 
-          sql = columns.map { |column| "#{klass.connection.quote_column_name(column)} = :current_time" }.join(", ")
+      # Touch the specified records--non-empty set of instances of the same class.
+      def touch_records(klass, columns, records, time)
+        if columns.present?
+          sql = columns.map { |column| "#{klass.connection.quote_column_name(column)} = :time" }.join(", ")
           sql += ", #{klass.locking_column} = #{klass.locking_column} + 1" if klass.locking_enabled?
 
-          klass.unscoped.where(klass.primary_key => records.to_a).update_all([sql, current_time: current_time])
+          klass.unscoped.where(klass.primary_key => records.to_a).update_all([sql, time: time])
         end
       end
     end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: activerecord-batch_touching
 version: !ruby/object:Gem::Version
-  version: 1.0.pre.beta3
+  version: 1.0.pre.beta4
 platform: ruby
 authors:
 - Brian Morearty