Added bind-named arrays for interpolating a group of ids or strings in conditions #528 [bitsweat]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@485 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
This commit is contained in:
parent
b29c01ea89
commit
872ddaf290
|
@ -1,5 +1,7 @@
|
|||
*SVN*
|
||||
|
||||
* Added bind-named arrays for interpolating a group of ids or strings in conditions #528 [bitsweat]
|
||||
|
||||
* Added that has_and_belongs_to_many associations with additional attributes also can be created between unsaved objects and only committed to the database when Base#save is called on the associator #524 [Eric Anderson]
|
||||
|
||||
* Fixed that records fetched with piggy-back attributes or through rich has_and_belongs_to_many associations couldn't be saved due to the extra attributes not part of the table #522 [Eric Anderson]
|
||||
|
|
|
@ -289,7 +289,7 @@ module ActiveRecord #:nodoc:
|
|||
if result.size == ids.size
|
||||
result
|
||||
else
|
||||
raise RecordNotFound, "Couldn't find #{name} with ID in (#{ids_list})#{conditions}"
|
||||
raise RecordNotFound, "Couldn't find all #{name.pluralize} with IDs (#{ids_list})#{conditions}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
@ -721,7 +721,7 @@ module ActiveRecord #:nodoc:
|
|||
def replace_bind_variables(statement, values)
|
||||
raise_if_bind_arity_mismatch(statement, statement.count('?'), values.size)
|
||||
bound = values.dup
|
||||
statement.gsub('?') { connection.quote(bound.shift) }
|
||||
statement.gsub('?') { quote_bound_value(bound.shift) }
|
||||
end
|
||||
|
||||
def replace_named_bind_variables(statement, bind_vars)
|
||||
|
@ -729,13 +729,22 @@ module ActiveRecord #:nodoc:
|
|||
statement.gsub(/:(\w+)/) do
|
||||
match = $1.to_sym
|
||||
if bind_vars.has_key?(match)
|
||||
connection.quote(bind_vars[match])
|
||||
quote_bound_value(bind_vars[match])
|
||||
else
|
||||
raise PreparedStatementInvalid, "missing value for :#{match} in #{statement}"
|
||||
end
|
||||
end
|
||||
end
|
||||
|
||||
def quote_bound_value(value)
|
||||
case value
|
||||
when Array
|
||||
value.map { |v| connection.quote(v) }.join(',')
|
||||
else
|
||||
connection.quote(value)
|
||||
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}"
|
||||
|
|
|
@ -147,6 +147,14 @@ class FinderTest < Test::Unit::TestCase
|
|||
assert_raises(ActiveRecord::PreparedStatementInvalid) { bind ':a :a', :a => 1, :b => 2 } # ' ruby-mode
|
||||
end
|
||||
|
||||
def test_bind_array
|
||||
assert_equal '1,2,3', bind('?', [1, 2, 3])
|
||||
assert_equal %('a','b','c'), bind('?', %w(a b c))
|
||||
|
||||
assert_equal '1,2,3', bind(':a', :a => [1, 2, 3])
|
||||
assert_equal %('a','b','c'), bind(':a', :a => %w(a b c))
|
||||
end
|
||||
|
||||
def test_string_sanitation
|
||||
assert_not_equal "'something ' 1=1'", ActiveRecord::Base.sanitize("something ' 1=1")
|
||||
assert_equal "'something; select table'", ActiveRecord::Base.sanitize("something; select table")
|
||||
|
|
Loading…
Reference in New Issue