Strip whitespace in disallow_raw_sql!
Removing trailing whitespace when matching columns in `ActiveRecord::Sanitization.disallow_raw_sql!`. Co-authored-by: Adrian Hirt <aedu.hirt@gmail.com>
This commit is contained in:
parent
1cd83476cd
commit
d4a9744860
@ -1,3 +1,8 @@
|
||||
* Removing trailing whitespace when matching columns in
|
||||
`ActiveRecord::Sanitization.disallow_raw_sql!`.
|
||||
|
||||
*Gannon McGibbon*, *Adrian Hirt*
|
||||
|
||||
* Expose a way for applications to set a `primary_abstract_class`
|
||||
|
||||
Multiple database applications that use a primary abstract class that is not
|
||||
|
@ -137,7 +137,7 @@ def sanitize_sql_array(ary)
|
||||
def disallow_raw_sql!(args, permit: connection.column_name_matcher) # :nodoc:
|
||||
unexpected = nil
|
||||
args.each do |arg|
|
||||
next if arg.is_a?(Symbol) || Arel.arel_node?(arg) || permit.match?(arg.to_s)
|
||||
next if arg.is_a?(Symbol) || Arel.arel_node?(arg) || permit.match?(arg.to_s.strip)
|
||||
(unexpected ||= []) << arg
|
||||
end
|
||||
|
||||
|
@ -914,6 +914,11 @@ def test_pluck_with_multiple_columns_and_selection_clause
|
||||
Account.order(:id).pluck("id, credit_limit")
|
||||
end
|
||||
|
||||
def test_pluck_with_line_endings
|
||||
assert_equal [[1, 50], [2, 50], [3, 50], [4, 60], [5, 55], [6, 53]],
|
||||
Account.order(:id).pluck("id, credit_limit\n")
|
||||
end
|
||||
|
||||
def test_pluck_with_multiple_columns_and_includes
|
||||
Company.create!(name: "test", contracts: [Contract.new(developer_id: 7)])
|
||||
companies_and_developers = Company.order("companies.id").includes(:contracts).pluck(:name, :developer_id)
|
||||
|
Loading…
Reference in New Issue
Block a user