Skip to content

Update db service #79

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
blocknotes merged 2 commits into from
Mar 15, 2026
Merged

Update db service #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
b9d59f7
fix: Call sanitize_sql_like on ActiveRecord::Base
blocknotes Mar 15, 2026
935322a
chore: Apply annotate properly inside object_for
blocknotes Mar 15, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 4 additions & 3 deletions lib/active_storage/service/db_service.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -68,7 +68,7 @@ def delete(key)
def delete_prefixed(prefix)
instrument :delete_prefixed, prefix: prefix do
comment = "DBService#delete_prefixed"
sanitized_prefix = "#{ApplicationRecord.sanitize_sql_like(prefix)}%"
sanitized_prefix = "#{ActiveRecord::Base.sanitize_sql_like(prefix)}%"
::ActiveStorageDB::File.annotate(comment).where("ref LIKE ?", sanitized_prefix).destroy_all
end
end
Expand Down Expand Up @@ -165,8 +165,9 @@ def retrieve_file(key)

def object_for(key, fields: nil)
comment = "DBService#object_for"
as_file = fields ? ::ActiveStorageDB::File.annotate(comment).select(*fields) : ::ActiveStorageDB::File
as_file.find_by(ref: key)
scope = ::ActiveStorageDB::File.annotate(comment)
scope = scope.select(*fields) if fields
scope.find_by(ref: key)
end

def stream(key)
Expand Down
4 changes: 3 additions & 1 deletion spec/requests/file_controller_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -146,7 +146,9 @@ def unprocessable
let(:invalid_file) { create(:active_storage_db_file, data: "Some other data") }

before do
allow(ActiveStorageDB::File).to receive(:find_by).and_return(invalid_file)
annotated_scope = ActiveStorageDB::File.annotate("DBService#object_for")
allow(ActiveStorageDB::File).to receive(:annotate).and_return(annotated_scope)
allow(annotated_scope).to receive(:find_by).and_return(invalid_file)
end

it "fails to upload" do
Expand Down
Loading