gitea/nas
1
0
Fork 1
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions 17

Update SafeReblogInsert concern to match Rails 8 method (#34966)

Browse source
This commit is contained in:
Matt Jankowski 2025-06-06 11:25:09 -04:00 • committed by GitHub
parent d0c6f30378
commit d887790e86
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 8 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

18
app/models/concerns/status/safe_reblog_insert.rb
View file

@ -16,7 +16,7 @@ module Status::SafeReblogInsert
# The code is kept similar to ActiveRecord::Persistence code and calls it # The code is kept similar to ActiveRecord::Persistence code and calls it
# directly when we are not handling a reblog. # directly when we are not handling a reblog.
# #
# https://github.com/rails/rails/blob/v7.2.1.1/activerecord/lib/active_record/persistence.rb#L238-L263 # https://github.com/rails/rails/blob/v8.0.2/activerecord/lib/active_record/persistence.rb#L238-L261
def _insert_record(connection, values, returning) def _insert_record(connection, values, returning)
return super unless values.is_a?(Hash) && values['reblog_of_id']&.value.present? return super unless values.is_a?(Hash) && values['reblog_of_id']&.value.present?
@ -36,15 +36,13 @@ module Status::SafeReblogInsert
# Instead, we use a custom builder when a reblog is happening: # Instead, we use a custom builder when a reblog is happening:
im = _compile_reblog_insert(values) im = _compile_reblog_insert(values)
with_connection do |_c| connection.insert(
connection.insert( im, "#{self} Create", primary_key || false, primary_key_value,
im, "#{self} Create", primary_key || false, primary_key_value, returning: returning
returning: returning ).tap do |result|
).tap do |result| # Since we are using SELECT instead of VALUES, a non-error `nil` return is possible.
# Since we are using SELECT instead of VALUES, a non-error `nil` return is possible. # For our purposes, it's equivalent to a foreign key constraint violation
# For our purposes, it's equivalent to a foreign key constraint violation raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id'].value}) is not present in table \"statuses\"" if result.nil?
raise ActiveRecord::InvalidForeignKey, "(reblog_of_id)=(#{values['reblog_of_id'].value}) is not present in table \"statuses\"" if result.nil?
end
end end
end end