aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/test/finder_test.rb
diff options
context:
space:
mode:
authorMarcel Molina <marcel@vernix.org>2006-01-05 21:40:15 +0000
committerMarcel Molina <marcel@vernix.org>2006-01-05 21:40:15 +0000
commit945dd920ab0954acdbc9b3317145b267a9638a50 (patch)
tree28b908d1c7f562e2fe6eb3feade392cad48a3df2 /activerecord/test/finder_test.rb
parenta5708b4c1f137baba8510ca1e1985bd1f878604b (diff)
downloadrails-945dd920ab0954acdbc9b3317145b267a9638a50.tar.gz
rails-945dd920ab0954acdbc9b3317145b267a9638a50.tar.bz2
rails-945dd920ab0954acdbc9b3317145b267a9638a50.zip
Don't raise an exception when there are more keys than there are named bind variables when sanitizing conditions.
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@3382 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/test/finder_test.rb')
-rw-r--r--activerecord/test/finder_test.rb16
1 files changed, 0 insertions, 16 deletions
diff --git a/activerecord/test/finder_test.rb b/activerecord/test/finder_test.rb
index 7e73eec7ad..515ec0f777 100644
--- a/activerecord/test/finder_test.rb
+++ b/activerecord/test/finder_test.rb
@@ -157,22 +157,6 @@ class FinderTest < Test::Unit::TestCase
assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!" }])
assert_nil Company.find(:first, :conditions => ["name = :name", { :name => "37signals!' OR 1=1" }])
assert_kind_of Time, Topic.find(:first, :conditions => ["id = :id", { :id => 1 }]).written_on
- assert_raises(ActiveRecord::PreparedStatementInvalid) {
- Company.find(:first, :conditions => ["id=:id and name=:name", { :id=>3 }])
- }
- assert_raises(ActiveRecord::PreparedStatementInvalid) {
- Company.find(:first, :conditions => ["id=:id", { :id=>3, :name=>"37signals!" }])
- }
- end
-
- def test_named_bind_arity
- assert_nothing_raised { bind '', {} }
- 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_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_bind_enumerable