kotovalexarian-likes-github
/
rails--rails
mirror of https://github.com/rails/rails.git
1
0
Fork 0
Code Releases Activity

do not depend on to_yaml being called, but rather depend on YAML being dumped

This commit is contained in:
Aaron Patterson 2011-04-13 11:41:34 -07:00
parent 0f8a6ebba3
commit 1f4dae9daa
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
activerecord/lib/active_record/connection_adapters/abstract/quoting.rb
View File

@ -35,7 +35,7 @@ module ActiveRecord
when Date, Time then "'#{quoted_date(value)}'"
when Symbol then "'#{quote_string(value.to_s)}'"
else
"'#{quote_string(value.to_yaml)}'"
"'#{quote_string(YAML.dump(value))}'"
end
end

13
activerecord/test/cases/quoting_test.rb
View File

@ -154,15 +154,16 @@ module ActiveRecord
end
def test_crazy_object
crazy = Class.new { def to_yaml; 'lol' end }.new
assert_equal "'lol'", @quoter.quote(crazy, nil)
assert_equal "'lol'", @quoter.quote(crazy, Object.new)
crazy = Class.new.new
expected = "'#{YAML.dump(crazy)}'"
assert_equal expected, @quoter.quote(crazy, nil)
assert_equal expected, @quoter.quote(crazy, Object.new)
end
def test_crazy_object_calls_quote_string
crazy = Class.new { def to_yaml; 'lo\l' end }.new
assert_equal "'lo\\\\l'", @quoter.quote(crazy, nil)
assert_equal "'lo\\\\l'", @quoter.quote(crazy, Object.new)
crazy = Class.new { def initialize; @lol = 'lo\l' end }.new
assert_match "lo\\\\l", @quoter.quote(crazy, nil)
assert_match "lo\\\\l", @quoter.quote(crazy, Object.new)
end
def test_quote_string_no_column