kotovalexarian-likes-github/rails--rails
1
0
Fork 0
mirror of https://github.com/rails/rails.git synced 2022-11-09 12:12:34 -05:00
Code Releases Activity

Change quote delimiters for sql interpolation to obviate SyntaxErrors. Closes 2215. [leroen@gmail.com]

Browse source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@2593 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
Marcel Molina 2005-10-14 23:28:35 +00:00
parent f2c7634db5
commit 6a6df5f1e2
2 changed files with 9 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
activerecord/lib/active_record/base.rb
View file

@ -1501,7 +1501,9 @@ module ActiveRecord #:nodoc:
# Interpolate custom sql string in instance context.
# Optional record argument is meant for custom insert_sql.
def interpolate_sql(sql, record = nil)
instance_eval("%(#{sql})")
# Parens in the sql in, e.g., subselects, cause a parse error, so
# escape them.
instance_eval("%@#{sql.gsub('@', '\@')}@")
end
# Initializes the attributes array with keys matching the columns from the linked table and

6
activerecord/test/base_test.rb
View file

@ -1018,6 +1018,12 @@ class BasicsTest < Test::Unit::TestCase
assert_equal firm.clients.collect{ |x| x.name }.sort, clients.collect{ |x| x.name }.sort
end
def test_interpolate_sql
assert_nothing_raised { Category.new.send(:interpolate_sql, 'foo@bar') }
assert_nothing_raised { Category.new.send(:interpolate_sql, 'foo bar) baz') }
assert_nothing_raised { Category.new.send(:interpolate_sql, 'foo bar} baz') }
end
private
def assert_readers(model, exceptions)