diff options
Diffstat (limited to 'lib')
-rw-r--r-- | lib/active_relation/relations/attribute.rb | 2 | ||||
-rw-r--r-- | lib/active_relation/relations/base.rb | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/lib/active_relation/relations/attribute.rb b/lib/active_relation/relations/attribute.rb index 30cd9798d9..b7233a4b17 100644 --- a/lib/active_relation/relations/attribute.rb +++ b/lib/active_relation/relations/attribute.rb @@ -22,7 +22,7 @@ module ActiveRelation end def eql?(other) - relation == other.relation and name == other.name and self.alias == other.alias + relation == other.relation and name == other.name and @alias == other.alias end module Predications diff --git a/lib/active_relation/relations/base.rb b/lib/active_relation/relations/base.rb index 67a64b9aa6..960735f07f 100644 --- a/lib/active_relation/relations/base.rb +++ b/lib/active_relation/relations/base.rb @@ -17,11 +17,11 @@ module ActiveRelation include Iteration module Operations - def <=>(other) + def join(other) JoinOperation.new("INNER JOIN", self, other) end - def <<(other) + def outer_join(other) JoinOperation.new("LEFT OUTER JOIN", self, other) end |