diff options
author | Nick Kallen <nkallen@nick-kallens-computer-2.local> | 2008-05-27 14:37:11 -0700 |
---|---|---|
committer | Bryan Helmkamp <bryan@brynary.com> | 2009-05-17 15:46:19 -0400 |
commit | 20b28b441b651d0404d64049253898c061a039be (patch) | |
tree | 4b9a8fc9e8f9207017248f129550c0283b0f520b /spec/arel/algebra/unit/primitives/expression_spec.rb | |
parent | 2fe585328d6a24df310d3e60059c9c7b05b64bac (diff) | |
download | rails-20b28b441b651d0404d64049253898c061a039be.tar.gz rails-20b28b441b651d0404d64049253898c061a039be.tar.bz2 rails-20b28b441b651d0404d64049253898c061a039be.zip |
using in memory relations as results from sql relation
Conflicts:
lib/arel/algebra/primitives/expression.rb
lib/arel/algebra/relations/relation.rb
Diffstat (limited to 'spec/arel/algebra/unit/primitives/expression_spec.rb')
-rw-r--r-- | spec/arel/algebra/unit/primitives/expression_spec.rb | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/spec/arel/algebra/unit/primitives/expression_spec.rb b/spec/arel/algebra/unit/primitives/expression_spec.rb index 10bdb56302..dfd2100048 100644 --- a/spec/arel/algebra/unit/primitives/expression_spec.rb +++ b/spec/arel/algebra/unit/primitives/expression_spec.rb @@ -31,7 +31,7 @@ module Arel describe '#to_attribute' do it "manufactures an attribute with the expression as an ancestor" do - @expression.to_attribute.should == Attribute.new(@expression.relation, @expression.alias, :ancestor => @expression) + @expression.to_attribute(@relation).should == Attribute.new(@relation, @expression.alias, :ancestor => @expression) end end end |