diff options
| author | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-29 10:26:53 -0700 |
|---|---|---|
| committer | Aaron Patterson <aaron.patterson@gmail.com> | 2011-04-29 10:26:53 -0700 |
| commit | d09a882329e8eeebac89e907289c537077f81d44 (patch) | |
| tree | 6815cf5af2fe213c2668c9f24e1e02ae7abed1b9 /lib | |
| parent | 9cd009b3728b07921cbfbfcf820748735c1de38c (diff) | |
| download | rails-d09a882329e8eeebac89e907289c537077f81d44.tar.gz rails-d09a882329e8eeebac89e907289c537077f81d44.tar.bz2 rails-d09a882329e8eeebac89e907289c537077f81d44.zip | |
Revert "Merged pull request #40 from gmile/master."
This reverts commit 490d6f98f8974c717ddca29df162f5f1ad48e094, reversing
changes made to dd07005dceb6641214f7d1166f75acbd379fb570.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/arel/predications.rb | 12 |
1 files changed, 1 insertions, 11 deletions
diff --git a/lib/arel/predications.rb b/lib/arel/predications.rb index 36eae074a8..08cbf16d9d 100644 --- a/lib/arel/predications.rb +++ b/lib/arel/predications.rb @@ -42,17 +42,7 @@ module Arel Nodes::Between.new(self, Nodes::And.new([other.begin, other.end])) end else - if other.include?(nil) - if other.size > 1 - set = Nodes::In.new self, other.compact - null = Nodes::Equality.new self, nil - Nodes::Or.new set, null - else - Nodes::Equality.new self, nil - end - else - Nodes::In.new self, other - end + Nodes::In.new self, other end end |