Skip to content

Fix SAR for rails v7.2 #9

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
schcamille merged 1 commit into from
Aug 4, 2025
Merged

Fix SAR for rails v7.2 #9

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 1 addition & 1 deletion .github/workflows/rspec.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@ jobs:
run-rspec-tests:
strategy:
matrix:
version: ['7.0', '6.0']
version: ['7.2', '7.0', '6.0']
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v4
Expand Down
14 changes: 10 additions & 4 deletions lib/safe_active_record/active_record_monkeypatch.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,16 @@ class << self
alias safe_ar_original_sql sql

# sql takes in arguments of TrustedSymbol or UncheckedString type.
def sql(raw_sql)
raw_sql = SafeActiveRecord.check_arg(raw_sql, 0)

safe_ar_original_sql(raw_sql)
def sql(sql_string, *positional_binds, retryable: false, **named_binds)
raw_sql = SafeActiveRecord.check_arg(sql_string, 0)

if defined?(ActiveRecord::VERSION) &&
Gem::Version.new(ActiveRecord::VERSION::STRING) >= Gem::Version.new('7.2.0')
# If the version is >= 7.2.0, pass the `retryable` parameter.
safe_ar_original_sql(raw_sql, *positional_binds, retryable: retryable, **named_binds)
else
safe_ar_original_sql(raw_sql, *positional_binds, **named_binds)
end
end
end
end