Skip to content
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

properly escape quotes in email addresses #5

Merged
merged 6 commits into from
Oct 22, 2024
Merged

properly escape quotes in email addresses #5

Changes from 1 commit
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
92a5f93
properly escape quotes in email addresses
mwvolo Oct 22, 2024
9d36ae1
update spec
mwvolo Oct 22, 2024
e007bde
run tests on PRs
mwvolo Oct 22, 2024
5a525e3
use latest ruby
mwvolo Oct 22, 2024
2ace3b6
simplify
mwvolo Oct 22, 2024
d6b370b
skip already failing spec
mwvolo Oct 22, 2024
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
4 changes: 2 additions & 2 deletions spec/active_force/active_query_spec.rb
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -147,7 +147,7 @@
let(:quote_input){ "' OR Id!=NULL OR Id='" }
let(:backslash_input){ "\\" }
let(:number_input){ 123 }
let(:expected_query){ "SELECT Id FROM table_name WHERE (Backslash_Field__c = '\\\\' AND NumberField = 123 AND QuoteField = ''' OR Id!=NULL OR Id=''')" }
let(:expected_query){ "SELECT Id FROM table_name WHERE (Backslash_Field__c = '\\\\' AND NumberField = 123 AND QuoteField = '\\\' OR Id!=NULL OR Id=\\'')" }
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This and line 164 should still give the same result if you use only 2 backslashes instead of 3

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

indeed it does - i'll push an update

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I just pushed to main - 3210375


it 'escapes quotes and backslashes in bind parameters' do
active_query.where('Backslash_Field__c = :backslash_field AND NumberField = :number_field AND QuoteField = :quote_field', number_field: number_input, backslash_field: backslash_input, quote_field: quote_input)
Expand All @@ -161,7 +161,7 @@

it 'escapes quotes and backslashes in hash conditions' do
active_query.where(backslash_field: backslash_input, number_field: number_input, quote_field: quote_input)
expect(active_query.to_s).to eq("SELECT Id FROM table_name WHERE (Backslash_Field__c = '\\\\') AND (NumberField = 123) AND (QuoteField = ''' OR Id!=NULL OR Id=''')")
expect(active_query.to_s).to eq("SELECT Id FROM table_name WHERE (Backslash_Field__c = '\\\\') AND (NumberField = 123) AND (QuoteField = '\\\' OR Id!=NULL OR Id=\\\'')")
end
end

Expand Down