From 93221685f131ea689d458bcd78f638fb3d6dfc90 Mon Sep 17 00:00:00 2001 From: David Heinemeier Hansson Date: Sun, 2 Jan 2005 12:45:53 +0000 Subject: Restored bind arity checking #412 [bitsweat] git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@306 5ecf4fe2-1ee6-0310-87b1-e25e094e27de --- activerecord/lib/active_record/base.rb | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) (limited to 'activerecord/lib/active_record') diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index e0e7c37d73..63810d3c41 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -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 -- cgit v1.2.3