diff options
author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-04-11 14:40:33 -0700 |
---|---|---|
committer | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-04-11 14:40:33 -0700 |
commit | 89eff9708d9519f8a2724427d9ed9a3bcbc6d125 (patch) | |
tree | d3351eddbdd09c7eaa37ec878f54297285f86246 /lib/active_relation | |
parent | 8887dcce12cd80f673e28537800e7657be9969d8 (diff) | |
download | rails-89eff9708d9519f8a2724427d9ed9a3bcbc6d125.tar.gz rails-89eff9708d9519f8a2724427d9ed9a3bcbc6d125.tar.bz2 rails-89eff9708d9519f8a2724427d9ed9a3bcbc6d125.zip |
removed binding for attributes and predicates
Diffstat (limited to 'lib/active_relation')
-rw-r--r-- | lib/active_relation/predicates.rb | 2 | ||||
-rw-r--r-- | lib/active_relation/primitives/attribute.rb | 14 |
2 files changed, 8 insertions, 8 deletions
diff --git a/lib/active_relation/predicates.rb b/lib/active_relation/predicates.rb index e17a9f82fe..dc4610b052 100644 --- a/lib/active_relation/predicates.rb +++ b/lib/active_relation/predicates.rb @@ -25,7 +25,7 @@ module ActiveRelation end def to_sql(formatter = nil) - "#{operand2.format(operand1)} #{predicate_sql} #{operand1.format(operand2)}" + "#{operand1.to_sql} #{predicate_sql} #{operand1.format(operand2)}" end def descend diff --git a/lib/active_relation/primitives/attribute.rb b/lib/active_relation/primitives/attribute.rb index d78e940ffc..ddf5ef5e07 100644 --- a/lib/active_relation/primitives/attribute.rb +++ b/lib/active_relation/primitives/attribute.rb @@ -63,31 +63,31 @@ module ActiveRelation module Predications def eq(other) - Equality.new(self, other.bind(relation)) + Equality.new(self, other) end def lt(other) - LessThan.new(self, other.bind(relation)) + LessThan.new(self, other) end def lteq(other) - LessThanOrEqualTo.new(self, other.bind(relation)) + LessThanOrEqualTo.new(self, other) end def gt(other) - GreaterThan.new(self, other.bind(relation)) + GreaterThan.new(self, other) end def gteq(other) - GreaterThanOrEqualTo.new(self, other.bind(relation)) + GreaterThanOrEqualTo.new(self, other) end def matches(regexp) - Match.new(self, regexp.bind(relation)) + Match.new(self, regexp) end def in(array) - In.new(self, array.bind(relation)) + In.new(self, array) end end include Predications |