diff options
author | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-06 04:13:23 -0700 |
---|---|---|
committer | Jeremy Kemper <jeremy@bitsweat.net> | 2008-06-06 04:13:23 -0700 |
commit | fec0f0678bef93f98cf1204bb007d109bbe97c37 (patch) | |
tree | 08fb8a5fa8070c1ceac5f40974eb659a21e0a274 /activerecord/lib/active_record/base.rb | |
parent | 49c4c7b997c9e55907c78723c73f537087b1497d (diff) | |
parent | e2c49e6a59f1b969a526586a3dd4dfd9c6f12b10 (diff) | |
download | rails-fec0f0678bef93f98cf1204bb007d109bbe97c37.tar.gz rails-fec0f0678bef93f98cf1204bb007d109bbe97c37.tar.bz2 rails-fec0f0678bef93f98cf1204bb007d109bbe97c37.zip |
Merge branch 'master' into erbout
Diffstat (limited to 'activerecord/lib/active_record/base.rb')
-rwxr-xr-x | activerecord/lib/active_record/base.rb | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/activerecord/lib/active_record/base.rb b/activerecord/lib/active_record/base.rb index 8dd07eb478..110902b590 100755 --- a/activerecord/lib/active_record/base.rb +++ b/activerecord/lib/active_record/base.rb @@ -2064,13 +2064,18 @@ module ActiveRecord #:nodoc: end def expand_range_bind_variables(bind_vars) #:nodoc: - bind_vars.sum do |var| + expanded = [] + + bind_vars.each do |var| if var.is_a?(Range) - [var.first, var.last] + expanded << var.first + expanded << var.last else - [var] + expanded << var end end + + expanded end def quote_bound_value(value) #:nodoc: |