github/rails
1
1
Fork 0
mirror of https://github.com/github/rails.git synced 2026-04-26 03:00:59 -04:00
Code Issues Packages Projects Releases Wiki Activity

Restored bind arity checking #412 [bitsweat]

Browse Source 
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
David Heinemeier Hansson
2005-01-02 12:45:53 +00:00
parent 6bd672eb0d
commit 93221685f1
2 changed files with 12 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
activerecord/lib/active_record/base.rb
View File

@@ -681,18 +681,13 @@ module ActiveRecord #:nodoc:
alias_method :sanitize_conditions, :sanitize_sql
def replace_bind_variables(statement, values)
expected_number_of_variables = statement.count('?')
provided_number_of_variables = values.size
unless expected_number_of_variables == provided_number_of_variables
raise PreparedStatementInvalid, "wrong number of bind variables (#{provided_number_of_variables} for #{expected_number_of_variables}) in: #{statement}"
end
raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
bound = values.dup
statement.gsub('?') { connection.quote(bound.shift) }
end
def replace_named_bind_variables(statement, bind_vars)
raise_if_bind_arity_mismatch(statement, statement.scan(/:(\w+)/).uniq.size, bind_vars.size)
statement.gsub(/:(\w+)/) do
match = $1.to_sym
if bind_vars.has_key?(match)
@@ -703,6 +698,12 @@ module ActiveRecord #:nodoc:
end
end
def raise_if_bind_arity_mismatch(statement, expected, provided)
unless expected == provided
raise PreparedStatementInvalid, "wrong number of bind variables (#{provided} for #{expected}) in: #{statement}"
end
end
def extract_options_from_args!(args)
if args.last.is_a?(Hash) then args.pop else {} end
end

6
activerecord/test/finder_test.rb
View File

@@ -143,10 +143,12 @@ class FinderTest < Test::Unit::TestCase
def test_named_bind_arity
assert_nothing_raised { bind '', {} }
assert_nothing_raised { bind '', :a => 1 }
assert_raises(ActiveRecord::PreparedStatementInvalid) { bind '', :a => 1 }
assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', {} } # ' ruby-mode
assert_nothing_raised { bind ':a', :a => 1 } # ' ruby-mode
assert_nothing_raised { bind ':a', :a => 1, :b => 2 } # ' ruby-mode
assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a', :a => 1, :b => 2 } # ' ruby-mode
assert_nothing_raised { bind ':a :a', :a => 1 } # ' ruby-mode
assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
end
def test_string_sanitation