diff options
author | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-30 10:41:50 -0700 |
---|---|---|
committer | Aaron Patterson <aaron.patterson@gmail.com> | 2010-07-30 10:41:50 -0700 |
commit | 1e327a5047f71ea6c93cde208c8b9206627c7302 (patch) | |
tree | 1ac6e2e5ecd1b564b44635a98cc65b8cb56aec09 | |
parent | 5bbd3d03d327b34ab2f3865f64b9008f6064d89a (diff) | |
download | rails-1e327a5047f71ea6c93cde208c8b9206627c7302.tar.gz rails-1e327a5047f71ea6c93cde208c8b9206627c7302.tar.bz2 rails-1e327a5047f71ea6c93cde208c8b9206627c7302.zip |
PERF: removing another def engine
-rw-r--r-- | lib/arel/algebra/relations/operations/where.rb | 11 | ||||
-rw-r--r-- | spec/support/model.rb | 2 |
2 files changed, 1 insertions, 12 deletions
diff --git a/lib/arel/algebra/relations/operations/where.rb b/lib/arel/algebra/relations/operations/where.rb index d851aebc44..98efb72ec1 100644 --- a/lib/arel/algebra/relations/operations/where.rb +++ b/lib/arel/algebra/relations/operations/where.rb @@ -12,17 +12,6 @@ module Arel @wheres ||= relation.wheres + predicates end - def engine - engine = relation.engine - - # Temporary check of whether or not the engine supports where. - if engine.respond_to?(:supports) && !engine.supports(:restricting) - Memory::Engine.new - else - engine - end - end - def eval unoperated_rows.select { |row| predicates.all? { |p| p.eval(row) } } end diff --git a/spec/support/model.rb b/spec/support/model.rb index f4973f4c57..45fe254d6f 100644 --- a/spec/support/model.rb +++ b/spec/support/model.rb @@ -13,7 +13,7 @@ module Arel def read(relation) case relation - when Arel::Take, Arel::Order, Arel::Skip + when Arel::Take, Arel::Order, Arel::Skip, Arel::Where relation.eval else @rows.dup.map { |r| Row.new(relation, r) } |