diff options
author | Douwe Maan <douwe@selenight.nl> | 2017-05-31 19:12:21 +0300 |
---|---|---|
committer | Douwe Maan <douwe@selenight.nl> | 2017-05-31 19:12:26 +0300 |
commit | 257f4eaa97d4ebed7feac36040a37650c25a6ca0 (patch) | |
tree | b3741561e3e0400802c5f59d01efee435fbe98a7 /config/initializers/active_record_locking.rb | |
parent | e53169c9702f1f4f25f8f1e91ed9ab7ace0a3d41 (diff) |
Do not try to preload Commits when using Note.includes(:noteable)
Diffstat (limited to 'config/initializers/active_record_locking.rb')
-rw-r--r-- | config/initializers/active_record_locking.rb | 74 |
1 files changed, 74 insertions, 0 deletions
diff --git a/config/initializers/active_record_locking.rb b/config/initializers/active_record_locking.rb new file mode 100644 index 00000000000..9266ff0f615 --- /dev/null +++ b/config/initializers/active_record_locking.rb @@ -0,0 +1,74 @@ +# rubocop:disable Lint/RescueException + +# This patch fixes https://github.com/rails/rails/issues/26024 +# TODO: Remove it when it's no longer necessary + +module ActiveRecord + module Locking + module Optimistic + # We overwrite this method because we don't want to have default value + # for newly created records + def _create_record(attribute_names = self.attribute_names, *) # :nodoc: + super + end + + def _update_record(attribute_names = self.attribute_names) #:nodoc: + return super unless locking_enabled? + return 0 if attribute_names.empty? + + lock_col = self.class.locking_column + + previous_lock_value = send(lock_col).to_i + + # This line is added as a patch + previous_lock_value = nil if previous_lock_value == '0' || previous_lock_value == 0 + + increment_lock + + attribute_names += [lock_col] + attribute_names.uniq! + + begin + relation = self.class.unscoped + + affected_rows = relation.where( + self.class.primary_key => id, + lock_col => previous_lock_value + ).update_all( + attributes_for_update(attribute_names).map do |name| + [name, _read_attribute(name)] + end.to_h + ) + + unless affected_rows == 1 + raise ActiveRecord::StaleObjectError.new(self, "update") + end + + affected_rows + + # If something went wrong, revert the version. + rescue Exception + send(lock_col + '=', previous_lock_value) + raise + end + end + + # This is patched because we need it to query `lock_version IS NULL` + # rather than `lock_version = 0` whenever lock_version is NULL. + def relation_for_destroy + return super unless locking_enabled? + + column_name = self.class.locking_column + super.where(self.class.arel_table[column_name].eq(self[column_name])) + end + end + + # This is patched because we want `lock_version` default to `NULL` + # rather than `0` + class LockingType < SimpleDelegator + def type_cast_from_database(value) + super + end + end + end +end |