aboutsummaryrefslogtreecommitdiffstats
path: root/activerecord/lib
diff options
context:
space:
mode:
authorDavid Heinemeier Hansson <david@loudthinking.com>2006-06-01 00:43:02 +0000
committerDavid Heinemeier Hansson <david@loudthinking.com>2006-06-01 00:43:02 +0000
commit9fcc0654c37772a3d6884c5d6f7099a39fe88f73 (patch)
treead4da3182056c22fac7492f315e5d71cee514b29 /activerecord/lib
parent24a5a803f3d01d1b6d72e1fb22a97b3922848cae (diff)
downloadrails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.tar.gz
rails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.tar.bz2
rails-9fcc0654c37772a3d6884c5d6f7099a39fe88f73.zip
Fixed that Base.find :all, :conditions => [ "id IN (?)", collection ] would fail if collection was empty [DHH]
git-svn-id: http://svn-commit.rubyonrails.org/rails/trunk@4390 5ecf4fe2-1ee6-0310-87b1-e25e094e27de
Diffstat (limited to 'activerecord/lib')
-rwxr-xr-xactiverecord/lib/active_record/base.rb6
1 files changed, 5 insertions, 1 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb
index 511af69428..4d878e6a1d 100755
--- a/activerecord/lib/active_record/base.rb
+++ b/activerecord/lib/active_record/base.rb
@@ -1309,7 +1309,11 @@ module ActiveRecord #:nodoc:
def quote_bound_value(value) #:nodoc:
if (value.respond_to?(:map) && !value.is_a?(String))
- value.map { |v| connection.quote(v) }.join(',')
+ if value.empty?
+ "null"
+ else
+ value.map { |v| connection.quote(v) }.join(',')
+ end
else
connection.quote(value)
end