Skip to content

HTTPS clone URL

Subversion checkout URL

You can clone with HTTPS or Subversion.

Download ZIP
Browse files

Restrictions should be able to contain multiple predicates.

  • Loading branch information...
commit 8991daa5e3077e31f90500fd52d77b69d979cc97 1 parent 0976582
Carl Lerche authored
10 lib/arel/algebra/relations/operations/where.rb
View
@@ -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
2  lib/arel/engines/memory/relations/operations.rb
View
@@ -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
1  spec/algebra/unit/relations/where_spec.rb
View
@@ -9,6 +9,7 @@ module Arel
describe '#initialize' do
it "manufactures nested where relations if multiple predicates are provided" do
+ pending "This is not true anymore"
another_predicate = @relation[:name].lt(2)
Where.new(@relation, @predicate, another_predicate). \
should == Where.new(Where.new(@relation, another_predicate), @predicate)
Please sign in to comment.
Something went wrong with that request. Please try again.