From 8991daa5e3077e31f90500fd52d77b69d979cc97 Mon Sep 17 00:00:00 2001 From: Carl Lerche Date: Tue, 23 Mar 2010 13:48:35 -0700 Subject: Restrictions should be able to contain multiple predicates. --- lib/arel/algebra/relations/operations/where.rb | 10 +++++----- lib/arel/engines/memory/relations/operations.rb | 2 +- 2 files changed, 6 insertions(+), 6 deletions(-) (limited to 'lib') diff --git a/lib/arel/algebra/relations/operations/where.rb b/lib/arel/algebra/relations/operations/where.rb index 6c9c5ed755..5c50fe8640 100644 --- a/lib/arel/algebra/relations/operations/where.rb +++ b/lib/arel/algebra/relations/operations/where.rb @@ -1,17 +1,17 @@ module Arel class Where < Compound - attributes :relation, :predicate + attributes :relation, :predicates deriving :== requires :restricting def initialize(relation, *predicates, &block) - predicate = block_given?? yield(relation) : predicates.shift - @relation = predicates.empty?? relation : Where.new(relation, *predicates) - @predicate = predicate.bind(@relation) + predicates = [yield(relation)] + predicates if block_given? + @predicates = predicates.map { |p| p.bind(relation) } + @relation = relation end def wheres - @wheres ||= (relation.wheres + [predicate]).collect { |p| p.bind(self) } + @wheres ||= relation.wheres + predicates end end end diff --git a/lib/arel/engines/memory/relations/operations.rb b/lib/arel/engines/memory/relations/operations.rb index 5d7b7670b6..55b4dcb677 100644 --- a/lib/arel/engines/memory/relations/operations.rb +++ b/lib/arel/engines/memory/relations/operations.rb @@ -1,7 +1,7 @@ module Arel class Where < Compound def eval - unoperated_rows.select { |row| predicate.eval(row) } + unoperated_rows.select { |row| predicates.all? { |p| p.eval(row) } } end end -- cgit v1.2.3